linux-kernel - RE: [PATCH v4 4/9] staging:lustre: merge socklnd

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <d1cf55b6a943441892138470b0f85ba0@EXCHCS32.ornl.gov>
Date:	Thu, 25 Jun 2015 15:06:37 +0000
From:	"Simmons, James A." <simmonsja@...l.gov>
To:	'Guenter Roeck' <linux@...ck-us.net>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
CC:	driverdevel <devel@...verdev.osuosl.org>,
	James Simmons <jsimmons@...radead.org>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Oleg Drokin <oleg.drokin@...el.com>,
	Andreas Dilger <andreas.dilger@...el.com>,
	"lustre-devel@...ts.lustre" <lustre-devel@...ts.lustre>
Subject: RE: [PATCH v4 4/9] staging:lustre: merge socklnd_lib-linux.h into
 socklnd.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 <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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/