RE: [PATCH v4 4/9] staging:lustre: merge socklnd_lib-linux.h into socklnd.h

[Simmons, James A.]

>> > 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 <asm/irq.h>
>> > +#include <linux/crc32.h>
>> > +#include <linux/errno.h>
>> 
>> Including <asm/irq.h> 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 <asm/*> include below all <linux/*>
>> includes?

I looked at our main development branch and I see socklnd.h no longer has
#include <asm/irq.h>. We can just remove the irq.h from socklnd.h.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/