From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168AbbFYPCo (ORCPT ); Thu, 25 Jun 2015 11:02:44 -0400 Received: from mta02.ornl.gov ([128.219.177.12]:9601 "EHLO mta02.ornl.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136AbbFYPCh convert rfc822-to-8bit (ORCPT ); Thu, 25 Jun 2015 11:02:37 -0400 X-SG: RELAYLIST X-IronPort-AV: E=Sophos;i="5.13,677,1427774400"; d="scan'208";a="82712653" From: "Simmons, James A." To: "'Geert Uytterhoeven'" , Guenter Roeck CC: driverdevel , James Simmons , Greg Kroah-Hartman , Linux Kernel Mailing List , Oleg Drokin , Andreas Dilger , "lustre-devel@lists.lustre" Subject: RE: [PATCH v4 4/9] staging:lustre: merge socklnd_lib-linux.h into socklnd.h Thread-Topic: [PATCH v4 4/9] staging:lustre: merge socklnd_lib-linux.h into socklnd.h Thread-Index: AQHQrucM/uO6L3CAnEKwR7QDxcLi3J29CCkAgABFsHA= Date: Thu, 25 Jun 2015 15:02:34 +0000 Message-ID: <59c1f7c04959471ea1f1ffd905cf51c1@EXCHCS32.ornl.gov> References: <1434050295-10986-1-git-send-email-jsimmons@infradead.org> <1434050295-10986-5-git-send-email-jsimmons@infradead.org> <20150625013346.GA13107@roeck-us.net> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [128.219.12.132] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >On Thu, Jun 25, 2015 at 3:33 AM, Guenter Roeck wrote: >> I have not tested it, but I think the following may fix the problem >> while avoiding any include problems. Since pt_regs is used in the file, >> one could argue that it should be declared. > >Indeed. I tried that, but... > >> -- >> diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h >> index 81ca118d58af..28ffa8d59cf0 100644 >> --- a/arch/m68k/include/asm/irq.h >> +++ b/arch/m68k/include/asm/irq.h >> @@ -74,6 +74,8 @@ extern unsigned int irq_canonicalize(unsigned int irq); >> #define irq_canonicalize(irq) (irq) >> #endif /* !(CONFIG_M68020 || CONFIG_M68030 || CONFIG_M68040 || CONFIG_M68060) */ >> >> +struct pt_regs; >> + >> asmlinkage void do_IRQ(int irq, struct pt_regs *regs); >> extern atomic_t irq_err_count; > >... asmlinkage and atomic_t are also needed. > >I didn't want to risk introducing more breakage by adding (at least) three >more includes. Hi Geert Long time. I agree the above is not the best approach. Lets fix lustre instead.