linux-next: build failure after merge of the asm-generic tree

linux-next: build failure after merge of the asm-generic tree

[Stephen Rothwell]

Hi Arnd,

After merging the asm-generic tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/acpi/osl.c:46:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory
 #include <asm-generic/io-64-nonatomic-lo-hi.h>
                                               ^

Caused by commit

  f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")

interacting with commit

  3277b4ea216e ("ACPI / osl: replace custom implementation of readq / writeq")

from Linus' tree (added before v4.3-rc1).

I added the following build fix:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Oct 2015 09:50:08 +1100
Subject: [PATCH] fix for "move io-64-nonatomic*.h out of asm-generic"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/acpi/osl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 739a4a6b3b9b..ed219da94904 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -40,10 +40,10 @@
 #include <linux/list.h>
 #include <linux/jiffies.h>
 #include <linux/semaphore.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
 
 #include "internal.h"
 
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the asm-generic tree

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]

Hi Stephen,

[auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]

url:    https://github.com/0day-ci/linux/commits/Stephen-Rothwell/linux-next-build-failure-after-merge-of-the-asm-generic-tree/20151015-065548
config: i386-randconfig-i1-201541 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

>> drivers/acpi/osl.c:43:41: fatal error: linux/io-64-nonatomic-lo-hi.h: No such file or directory
   compilation terminated.

vim +43 drivers/acpi/osl.c

    37	#include <linux/acpi.h>
    38	#include <linux/efi.h>
    39	#include <linux/ioport.h>
    40	#include <linux/list.h>
    41	#include <linux/jiffies.h>
    42	#include <linux/semaphore.h>
  > 43	#include <linux/io-64-nonatomic-lo-hi.h>
    44	
    45	#include <asm/io.h>
    46	#include <asm/uaccess.h>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 18058 bytes --]

Re: linux-next: build failure after merge of the asm-generic tree

[Stephen Rothwell]

Hi,

On Thu, 15 Oct 2015 07:32:27 +0800 kbuild test robot <lkp@intel.com> wrote:
>
> [auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]

I think you should just ignore any patches from me that have
"linux-next:" in the subject line as they need to be applied either to
a branch I have merged or to a combination of branches I have merged.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: [kbuild-all] linux-next: build failure after merge of the asm-generic tree

[Fengguang Wu]

Hi Stephen,

On Thu, Oct 15, 2015 at 01:37:34PM +1100, Stephen Rothwell wrote:
> Hi,
> 
> On Thu, 15 Oct 2015 07:32:27 +0800 kbuild test robot <lkp@intel.com> wrote:
> >
> > [auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]
> 
> I think you should just ignore any patches from me that have
> "linux-next:" in the subject line as they need to be applied either to
> a branch I have merged or to a combination of branches I have merged.

OK. Sorry for the noise!

Thanks,
Fengguang

Re: [kbuild-all] linux-next: build failure after merge of the asm-generic tree

[Stephen Rothwell]

Hi Fengguang,

On Thu, 15 Oct 2015 22:45:32 +0800 Fengguang Wu <lkp@intel.com> wrote:
>
> On Thu, Oct 15, 2015 at 01:37:34PM +1100, Stephen Rothwell wrote:
> > 
> > On Thu, 15 Oct 2015 07:32:27 +0800 kbuild test robot <lkp@intel.com> wrote:  
> > >
> > > [auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]  
> > 
> > I think you should just ignore any patches from me that have
> > "linux-next:" in the subject line as they need to be applied either to
> > a branch I have merged or to a combination of branches I have merged.  
> 
> OK. Sorry for the noise!

No worries, keep up the good work!

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au