From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Lutomirski <luto@amacapital•net>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Arnaldo Carvalho de Melo <acme@redhat•com>
Subject: linux-next: build failure after merge of the luto-misc tree
Date: Fri, 15 Jul 2016 17:06:54 +1000 [thread overview]
Message-ID: <20160715170654.0b09a8bc@canb.auug.org.au> (raw)
Hi Andy,
After merging the luto-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from arch/x86/include/uapi/asm/bitsperlong.h:10:0,
from include/uapi/asm-generic/int-ll64.h:11,
from include/uapi/asm-generic/types.h:6,
from arch/x86/include/uapi/asm/types.h:4,
from tools/include/linux/types.h:9,
from include/uapi/linux/elf.h:4,
from arch/x86/entry/vdso/vdso2c.c:66:
tools/include/asm-generic/bitsperlong.h:32:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
#error Inconsistent word size. Check asm/bitsperlong.h
^
Caused by commit
6436d4c1a83c ("x86/vdso: Fail the build if the vdso image has no dynamic section")
interacting with commit
2a00f026a15d ("tools: Fix up BITS_PER_LONG setting")
from the tip tree.
I am not sure why 6436d4c1a83c does this ... maybe it just causes
arch/x86/entry/vdso/vdso2c.c to be rebuilt?
I applied this partial revert of the latter commit:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 15 Jul 2016 16:58:25 +1000
Subject: [PATCH] tools: partial revert of 2a00f026a15d "tools: Fix up
BITS_PER_LONG setting"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
tools/include/asm-generic/bitsperlong.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
index cfd661c6fc17..cb047bd03b69 100644
--- a/tools/include/asm-generic/bitsperlong.h
+++ b/tools/include/asm-generic/bitsperlong.h
@@ -28,7 +28,11 @@
#define BITS_PER_LONG 32
#endif /* CONFIG_64BIT */
-#if BITS_PER_LONG != __BITS_PER_LONG
+/*
+ * FIXME: The check currently breaks x86-64 build, so it's
+ * temporarily disabled. Please fix x86-64 and reenable
+ */
+#if 0 && BITS_PER_LONG != __BITS_PER_LONG
#error Inconsistent word size. Check asm/bitsperlong.h
#endif
--
2.8.1
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-07-15 7:06 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 7:06 Stephen Rothwell [this message]
2016-07-15 7:22 ` linux-next: build failure after merge of the luto-misc tree Peter Zijlstra
2016-07-15 7:31 ` Peter Zijlstra
2016-07-15 15:09 ` Arnaldo Carvalho de Melo
2016-07-15 15:24 ` Arnaldo Carvalho de Melo
2016-07-15 15:29 ` Peter Zijlstra
2016-07-15 15:56 ` Arnaldo Carvalho de Melo
2016-07-15 15:43 ` [PATCH/RFC] " Arnaldo Carvalho de Melo
2016-07-15 15:49 ` Peter Zijlstra
2016-07-15 16:28 ` Arnaldo Carvalho de Melo
2016-07-15 20:26 ` H. Peter Anvin
2016-07-18 5:18 ` Stephen Rothwell
2016-07-18 20:04 ` Andy Lutomirski
2016-07-18 20:36 ` Arnaldo Carvalho de Melo
2016-07-18 22:22 ` Stephen Rothwell
2016-07-18 23:41 ` Arnaldo Carvalho de Melo
2016-07-19 0:26 ` Stephen Rothwell
2016-07-19 0:39 ` Arnaldo Carvalho de Melo
2016-07-19 3:26 ` Stephen Rothwell
2016-07-19 12:54 ` Arnaldo Carvalho de Melo
2016-07-19 17:45 ` Arnaldo Carvalho de Melo
2016-07-19 23:21 ` Stephen Rothwell
2016-07-19 23:53 ` Stephen Rothwell
2016-07-20 2:52 ` Arnaldo Carvalho de Melo
2016-07-20 2:57 ` Andy Lutomirski
2016-07-20 3:09 ` Arnaldo Carvalho de Melo
2016-07-20 3:18 ` Stephen Rothwell
2016-07-20 23:29 ` Stephen Rothwell
2016-07-21 13:12 ` Arnaldo Carvalho de Melo
2016-07-21 23:23 ` Stephen Rothwell
2016-07-22 3:41 ` Josh Poimboeuf
2016-07-22 14:37 ` Arnaldo Carvalho de Melo
2016-07-22 19:19 ` Josh Poimboeuf
2016-07-22 19:36 ` Arnaldo Carvalho de Melo
2016-07-22 19:44 ` Josh Poimboeuf
2016-07-22 19:57 ` Arnaldo Carvalho de Melo
2016-07-23 5:08 ` Stephen Rothwell
2016-07-24 18:40 ` Andy Lutomirski
2016-07-25 12:56 ` Arnaldo Carvalho de Melo
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=20160715170654.0b09a8bc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=acme@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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