From: Paul Mundt <lethal@linux-sh.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Al Viro <viro@zeniv.linux.org.uk>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: build failure in Linus' tree
Date: Thu, 14 Jun 2012 12:40:36 +0900 [thread overview]
Message-ID: <20120614034036.GE27673@linux-sh.org> (raw)
In-Reply-To: <20120614030606.GC27673@linux-sh.org>
(adding Arnd to Cc, who I forgot to include previously)
On Thu, Jun 14, 2012 at 12:06:06PM +0900, Paul Mundt wrote:
> On Thu, Jun 14, 2012 at 11:47:22AM +1000, Stephen Rothwell wrote:
> > While building Linus' tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > In file included from include/asm-generic/bug.h:5:0,
> > from arch/powerpc/include/asm/bug.h:127,
> > from arch/powerpc/kernel/head_64.S:31:
> > include/linux/kernel.h:44:0: warning: "ALIGN" redefined [enabled by default]
> > include/linux/linkage.h:57:0: note: this is the location of the previous definition
> > include/linux/sysinfo.h: Assembler messages:
> > include/linux/sysinfo.h:7: Error: Unrecognized opcode: `struct'
> > include/linux/sysinfo.h:8: Error: Unrecognized opcode: `__kernel_long_t'
> >
> > And it went downhill from there :-(
> >
> > Caused by commit 3777808873b0 ("bug.h: need linux/kernel.h for
> > TAINT_WARN") which, unfortunately never made it into linux-next.
> >
> > I have reverted that commit for today (which presumably means that sh
> > builds will be broken again).
>
> I'm still unsure as to the best way to fix this, and there was no
> response to the original mail I posted about it either:
>
> http://marc.info/?l=linux-kernel&m=133879579014853&w=2
>
> I'll fetch a powerpc cross compiler and see if I can figure out what went
> wrong.
>
Ok, it's because the asm-generic/bug.h __ASSEMBLY__ guarding is
completely bogus. This should hopefully fix it once and for all.
Sorry for the trouble.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
include/asm-generic/bug.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 9f02005..506ec19 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -2,7 +2,6 @@
#define _ASM_GENERIC_BUG_H
#include <linux/compiler.h>
-#include <linux/kernel.h>
#ifdef CONFIG_BUG
@@ -32,6 +31,9 @@ struct bug_entry {
#endif /* CONFIG_GENERIC_BUG */
+#ifndef __ASSEMBLY__
+#include <linux/kernel.h>
+
/*
* Don't use BUG() or BUG_ON() unless there's really no way out; one
* example might be detecting data structure corruption in the middle
@@ -61,7 +63,6 @@ struct bug_entry {
* to provide better diagnostics.
*/
#ifndef __WARN_TAINT
-#ifndef __ASSEMBLY__
extern __printf(3, 4)
void warn_slowpath_fmt(const char *file, const int line,
const char *fmt, ...);
@@ -70,7 +71,6 @@ void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
const char *fmt, ...);
extern void warn_slowpath_null(const char *file, const int line);
#define WANT_WARN_ON_SLOWPATH
-#endif
#define __WARN() warn_slowpath_null(__FILE__, __LINE__)
#define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
#define __WARN_printf_taint(taint, arg...) \
@@ -203,4 +203,6 @@ extern void warn_slowpath_null(const char *file, const int line);
# define WARN_ON_SMP(x) ({0;})
#endif
+#endif /* __ASSEMBLY__ */
+
#endif
next prev parent reply other threads:[~2012-06-14 3:40 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-14 1:47 linux-next: build failure in Linus' tree Stephen Rothwell
2012-06-14 3:06 ` Paul Mundt
2012-06-14 3:40 ` Paul Mundt [this message]
2012-06-15 0:14 ` Stephen Rothwell
2012-06-15 0:56 ` Paul Mundt
2012-06-17 23:38 ` Benjamin Herrenschmidt
2012-06-18 4:58 ` Paul Mundt
2012-06-15 9:23 ` Sedat Dilek
2012-06-15 10:15 ` Sedat Dilek
2012-06-15 8:46 ` Richard W.M. Jones
2012-06-15 11:38 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2022-03-27 22:01 Stephen Rothwell
2022-03-27 22:23 ` Linus Torvalds
2022-03-27 22:31 ` Linus Torvalds
2022-03-27 23:33 ` Stephen Rothwell
2021-11-05 4:54 Stephen Rothwell
2021-11-05 9:25 ` Suzuki K Poulose
2021-11-05 4:49 Stephen Rothwell
2021-09-07 1:02 Stephen Rothwell
2021-09-06 5:57 Stephen Rothwell
2021-07-14 23:50 Stephen Rothwell
2021-07-20 6:45 ` Stephen Rothwell
2021-07-20 12:11 ` Jakub Kicinski
2021-07-22 23:04 ` Stephen Rothwell
2020-11-23 7:40 Stephen Rothwell
2020-11-23 23:39 ` Michael Ellerman
2020-11-24 0:23 ` Daniel Axtens
2020-11-25 2:47 ` Michael Ellerman
2020-06-21 2:05 Stephen Rothwell
2020-04-20 11:46 linux-next: build failure in Linus tree Stephen Rothwell
2020-04-28 8:48 ` Stephen Rothwell
2020-05-18 22:20 ` Stephen Rothwell
2020-04-05 1:22 linux-next: build failure in Linus' tree Stephen Rothwell
2020-04-05 1:27 ` Stephen Rothwell
2020-02-09 21:08 Stephen Rothwell
2020-02-09 21:24 ` Linus Torvalds
2020-02-09 22:57 ` Marc Zyngier
2020-02-09 23:48 ` Linus Torvalds
2020-02-10 2:00 ` Zenghui Yu
2018-10-28 22:45 Stephen Rothwell
2018-10-28 22:35 Stephen Rothwell
2018-10-28 22:45 ` Linus Torvalds
2018-10-29 1:38 ` Hangbin Liu
2018-10-29 2:17 ` David Miller
2018-06-12 2:26 Stephen Rothwell
2018-06-18 3:50 ` Stephen Rothwell
2018-02-04 22:28 Stephen Rothwell
2017-09-17 23:34 Stephen Rothwell
2016-03-27 6:06 Stephen Rothwell
2016-03-28 20:44 ` Arnaldo Carvalho de Melo
2014-11-03 4:09 Stephen Rothwell
2014-11-03 4:16 ` David Miller
2012-07-27 0:15 Stephen Rothwell
2012-07-27 0:23 ` Stephen Rothwell
2012-07-27 1:04 ` Linus Torvalds
2012-05-14 0:50 Stephen Rothwell
2012-05-14 6:57 ` Grant Likely
2012-05-14 8:32 ` Thomas Gleixner
2012-05-07 0:08 Stephen Rothwell
2012-05-07 0:10 ` Al Viro
2012-04-19 0:41 Stephen Rothwell
2012-01-24 0:51 Stephen Rothwell
2011-08-29 0:44 Stephen Rothwell
2011-08-29 22:32 ` Stephen Rothwell
2011-08-29 22:50 ` James Bottomley
2011-08-11 1:59 Stephen Rothwell
2011-08-11 6:43 ` Borislav Petkov
2011-05-26 1:12 Stephen Rothwell
2011-05-20 1:15 Stephen Rothwell
2011-05-20 1:19 ` Linus Torvalds
2011-03-17 23:29 Stephen Rothwell
2011-03-17 23:35 ` Luck, Tony
2011-01-14 23:40 Stephen Rothwell
2011-01-19 3:12 ` Konrad Rzeszutek Wilk
2011-01-19 4:19 ` Stephen Rothwell
2011-01-13 23:43 Stephen Rothwell
2011-01-14 1:24 ` Linus Torvalds
2011-01-14 2:17 ` Al Viro
2010-12-21 1:01 Stephen Rothwell
2010-12-21 4:47 ` Sedat Dilek
2010-10-06 0:09 Stephen Rothwell
2010-05-28 0:57 Stephen Rothwell
2010-05-28 1:09 ` Linus Torvalds
2010-05-30 0:43 ` Stephen Rothwell
2010-06-01 17:04 ` Tony Luck
2010-06-01 17:07 ` Linus Torvalds
2010-05-24 0:40 Stephen Rothwell
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=20120614034036.GE27673@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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).