Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1247242

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

Show all headers | View raw

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the asm-generic tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 01:00 +0200
  Re: linux-next: build failure after merge of the asm-generic tree kbuild test robot <lkp@intel.com> - 2015-10-15 01:40 +0200
    Re: linux-next: build failure after merge of the asm-generic tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 04:40 +0200
      Re: [kbuild-all] linux-next: build failure after merge of the  asm-generic tree Fengguang Wu <lkp@intel.com> - 2015-10-15 16:50 +0200
        Re: [kbuild-all] linux-next: build failure after merge of the  asm-generic tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 17:00 +0200

csiph-web