From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the asm-generic tree
Date: Thu, 15 Oct 2015 09:55:03 +1100 [thread overview]
Message-ID: <20151015095503.4f35b216@canb.auug.org.au> (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
next reply other threads:[~2015-10-14 22:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-14 22:55 Stephen Rothwell [this message]
2015-10-14 23:32 ` linux-next: build failure after merge of the asm-generic tree kbuild test robot
2015-10-15 2:37 ` Stephen Rothwell
2015-10-15 14:45 ` [kbuild-all] " Fengguang Wu
2015-10-15 14:56 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-07-20 12:36 Stephen Rothwell
2022-07-20 12:51 ` Arnd Bergmann
2022-07-21 6:57 ` Lukas Bulwahn
2019-02-19 6:36 Stephen Rothwell
2019-02-19 7:45 ` Hugo Lefeuvre
2019-02-19 10:14 ` Arnd Bergmann
2019-02-19 11:19 ` Hugo Lefeuvre
2019-02-19 14:42 ` Arnd Bergmann
2018-03-15 22:13 Stephen Rothwell
2018-03-15 22:47 ` Bin Liu
2018-03-16 8:07 ` Arnd Bergmann
2014-11-19 7:54 Stephen Rothwell
2014-11-19 9:21 ` Arnd Bergmann
2014-09-26 10:02 Stephen Rothwell
2014-09-26 10:53 ` Will Deacon
2014-09-26 11:14 ` Arnd Bergmann
2014-09-29 22:31 ` Stephen Rothwell
2014-09-30 10:00 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151015095503.4f35b216@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).