From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751498AbbFYPGr (ORCPT <rfc822;w@1wt.eu>);
	Thu, 25 Jun 2015 11:06:47 -0400
Received: from mta01.ornl.gov ([128.219.177.14]:1574 "EHLO mta01.ornl.gov"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751213AbbFYPGk convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 25 Jun 2015 11:06:40 -0400
X-SG: RELAYLIST
X-IronPort-AV: E=Sophos;i="5.13,677,1427774400"; 
   d="scan'208";a="105497159"
From: "Simmons, James A." <simmonsja@ornl.gov>
To: "'Guenter Roeck'" <linux@roeck-us.net>,
        Geert Uytterhoeven <geert@linux-m68k.org>
CC: driverdevel <devel@driverdev.osuosl.org>,
        James Simmons <jsimmons@infradead.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Oleg Drokin <oleg.drokin@intel.com>,
        Andreas Dilger <andreas.dilger@intel.com>,
        "lustre-devel@lists.lustre" <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/uO6L3CAnEKwR7QDxcLi3J29UljQ
Date: Thu, 25 Jun 2015 15:06:37 +0000
Message-ID: <d1cf55b6a943441892138470b0f85ba0@EXCHCS32.ornl.gov>
References: <1434050295-10986-1-git-send-email-jsimmons@infradead.org>
 <1434050295-10986-5-git-send-email-jsimmons@infradead.org>
 <CAMuHMdV6e_0qKkAVwAuyFFMhGxqW5ekifEyKiZevRahgu+ozWQ@mail.gmail.com>
 <20150625013346.GA13107@roeck-us.net>
In-Reply-To: <20150625013346.GA13107@roeck-us.net>
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

>> > 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.