From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752671AbbFYBd6 (ORCPT ); Wed, 24 Jun 2015 21:33:58 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:47658 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbbFYBdw (ORCPT ); Wed, 24 Jun 2015 21:33:52 -0400 Date: Wed, 24 Jun 2015 18:33:46 -0700 From: Guenter Roeck To: Geert Uytterhoeven Cc: James Simmons , Greg Kroah-Hartman , driverdevel , Oleg Drokin , Andreas Dilger , Linux Kernel Mailing List , lustre-devel@lists.lustre Subject: Re: [PATCH v4 4/9] staging:lustre: merge socklnd_lib-linux.h into socklnd.h Message-ID: <20150625013346.GA13107@roeck-us.net> References: <1434050295-10986-1-git-send-email-jsimmons@infradead.org> <1434050295-10986-5-git-send-email-jsimmons@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 24, 2015 at 02:37:51PM +0200, Geert Uytterhoeven wrote: > Hi James, > > On Thu, Jun 11, 2015 at 9:18 PM, James Simmons wrote: > > From: John L. Hammond > > > > Originally socklnd_lib-linux.h contained linux specific > > wrappers and defines but since the linux kernel is the > > only supported platform now we can merge what little > > remains in the header into socklnd.h. This is broken > > out of the original patch 12932 that was merged to the > > Intel/OpenSFS branch. > > > > Signed-off-by: John L. Hammond > > Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675 > > Reviewed-on: http://review.whamcloud.com/12932 > > Reviewed-by: Isaac Huang > > Reviewed-by: James Simmons > > Reviewed-by: Oleg Drokin > > Signed-off-by: James Simmons > > --- > > .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 39 +++++++++- > > .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 86 -------------------- > > .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 4 +- > > 3 files changed, 40 insertions(+), 89 deletions(-) > > delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h > > > > diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h > > index 53275f9..7125eb9 100644 > > --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h > > +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h > > @@ -25,16 +25,40 @@ > > * > > */ > > > > +#ifndef _SOCKLND_SOCKLND_H_ > > +#define _SOCKLND_SOCKLND_H_ > > + > > #define DEBUG_PORTAL_ALLOC > > #define DEBUG_SUBSYSTEM S_LND > > > > -#include "socklnd_lib-linux.h" > > +#include > > +#include > > +#include > > Including first causes a build failure for m68k/allmodconfig: > > arch/m68k/include/asm/irq.h:77:12: error: expected '=', ',', ';', > 'asm' or '__attribute__' before 'void' > arch/m68k/include/asm/irq.h:78:1: error: unknown type name 'atomic_t' > arch/m68k/include/asm/irq.h:77:12: error: expected '=', ',', ';', > 'asm' or '__attribute__' before 'void' > arch/m68k/include/asm/irq.h:78:1: error: unknown type name 'atomic_t' > > http://kisskb.ellerman.id.au/kisskb/buildresult/12448922/ > > Fixing it inside arch/m68k/include/asm/irq.h might cause Include Hell, > so perhaps you can just move the include below all > includes? > Hi Geert, 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. Thanks, Guenter -- 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;