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,
Will Deacon <will.deacon@arm•com>,
"David S. Miller" <davem@davemloft•net>
Subject: linux-next: build failure after merge of the asm-generic tree
Date: Fri, 26 Sep 2014 20:02:51 +1000 [thread overview]
Message-ID: <20140926200251.78f0d713@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2881 bytes --]
Hi Arnd,
After merging the asm-generic tree, today's linux-next build (sparc
defconfig) failed like this:
In file included from /scratch/sfr/next/include/linux/clocksource.h:19:0,
from /scratch/sfr/next/arch/sparc/include/asm/timer_32.h:11,
from /scratch/sfr/next/arch/sparc/include/asm/timer.h:6,
from /scratch/sfr/next/arch/sparc/kernel/sun4m_irq.c:14:
/scratch/sfr/next/arch/sparc/include/asm/io.h:14:0: error: "readb_relaxed" redefined [-Werror]
#define readb_relaxed(__addr) readb(__addr)
^
In file included from /scratch/sfr/next/arch/sparc/include/asm/io_32.h:13:0,
from /scratch/sfr/next/arch/sparc/include/asm/io.h:6,
from /scratch/sfr/next/include/linux/clocksource.h:19,
from /scratch/sfr/next/arch/sparc/include/asm/timer_32.h:11,
from /scratch/sfr/next/arch/sparc/include/asm/timer.h:6,
from /scratch/sfr/next/arch/sparc/kernel/sun4m_irq.c:14:
/scratch/sfr/next/include/asm-generic/io.h:182:0: note: this is the location of the previous definition
#define readb_relaxed readb
^
And so on several hundred times ... :-(
Caused by commits 95a668b0452e ("sparc: io: implement dummy relaxed
accessor macros for writes") and 4c255791ffd6 ("asm-generic: io:
implement relaxed accessor macros as conditional wrappers").
arch/sparc/include/asm_32.h includes asm-generic/io.h which means it is
include before the arch specific versions of the relaxed functions are
defined ...
I have added this patch for today:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 26 Sep 2014 19:57:03 +1000
Subject: [PATCH] sparc: io: fix for asm-generic: io: implement relaxed
accessor macros as conditional wrappers
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/sparc/include/asm/io.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h
index 493f22c4684f..79b167674010 100644
--- a/arch/sparc/include/asm/io.h
+++ b/arch/sparc/include/asm/io.h
@@ -1,10 +1,5 @@
#ifndef ___ASM_SPARC_IO_H
#define ___ASM_SPARC_IO_H
-#if defined(__sparc__) && defined(__arch64__)
-#include <asm/io_64.h>
-#else
-#include <asm/io_32.h>
-#endif
/*
* Defines used for both SPARC32 and SPARC64
@@ -19,6 +14,12 @@
#define writew_relaxed(__w, __addr) writew(__w, __addr)
#define writel_relaxed(__l, __addr) writel(__l, __addr)
+#if defined(__sparc__) && defined(__arch64__)
+#include <asm/io_64.h>
+#else
+#include <asm/io_32.h>
+#endif
+
/* Big endian versions of memory read/write routines */
#define readb_be(__addr) __raw_readb(__addr)
#define readw_be(__addr) __raw_readw(__addr)
--
2.1.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-26 10:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-26 10:02 Stephen Rothwell [this message]
2014-09-26 10:53 ` linux-next: build failure after merge of the asm-generic tree Will Deacon
2014-09-26 11:14 ` Arnd Bergmann
2014-09-29 22:31 ` Stephen Rothwell
2014-09-30 10:00 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2014-11-19 7:54 Stephen Rothwell
2014-11-19 9:21 ` Arnd Bergmann
2015-10-14 22:55 Stephen Rothwell
2015-10-14 23:32 ` kbuild test robot
2015-10-15 2:37 ` Stephen Rothwell
2018-03-15 22:13 Stephen Rothwell
2018-03-15 22:47 ` Bin Liu
2018-03-16 8:07 ` Arnd Bergmann
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
2022-07-20 12:36 Stephen Rothwell
2022-07-20 12:51 ` Arnd Bergmann
2022-07-21 6:57 ` Lukas Bulwahn
2024-08-06 4:54 Stephen Rothwell
2024-08-06 6:30 ` Arnd Bergmann
2024-08-06 6:50 ` 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=20140926200251.78f0d713@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=will.deacon@arm$(echo .)com \
/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