WSL2-Linux-Kernel/arch
Arnd Bergmann 7c3969c3a4 sparc: io: remove duplicate relaxed accessors on sparc32
Commit 1191ccb34c ("sparc: io: implement dummy relaxed accessor
macros for writes") added the relaxed accessors (readl_relaxed etc) in
a file that is shared between sparc32 and sparc64. However, the earlier
e1039fb426 ("sparc32: introduce asm-generic/io.h") had already changed
the sparc32 implementation to use asm-generic/io.h, which provides the
same macros, resulting in lots of build errors.

This moves the definitions from the shared sparc file into the
sparc64-only file to fix the sparc32 build regression.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 1191ccb34c ("sparc: io: implement dummy relaxed accessor macros for writes")
2014-11-19 10:19:45 +01:00
..
alpha Merge git://git.infradead.org/users/eparis/audit 2014-10-19 16:25:56 -07:00
arc ARC: Remove redundant PCI_IOBASE declaration 2014-11-10 12:14:53 +01:00
arm ARM: sa11x0: Use void __iomem * in MMIO accessors 2014-11-11 19:28:24 +01:00
arm64 arm64: Use include/asm-generic/io.h 2014-11-10 15:59:23 +01:00
avr32 Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2014-10-18 18:11:04 -07:00
blackfin Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2014-10-15 07:48:18 +02:00
c6x irq_work: Introduce arch_irq_work_has_interrupt() 2014-09-13 18:38:07 +02:00
cris cris: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:17 +01:00
frv frv: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:17 +01:00
hexagon Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-10-13 15:48:00 +02:00
ia64 Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into asm-generic 2014-11-11 19:55:45 +01:00
m32r m32r: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:17 +01:00
m68k m68k: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:18 +01:00
metag Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2014-10-15 07:48:18 +02:00
microblaze microblaze: io: remove dummy relaxed accessor macros 2014-10-20 18:49:17 +01:00
mips Merge git://git.infradead.org/users/eparis/audit 2014-10-19 16:25:56 -07:00
mn10300 mn10300: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:18 +01:00
openrisc Merge git://git.infradead.org/users/eparis/audit 2014-10-19 16:25:56 -07:00
parisc parisc: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:18 +01:00
powerpc powerpc: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:18 +01:00
s390 Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into asm-generic 2014-11-11 19:55:45 +01:00
score score: use Kbuild logic to include <asm-generic/sections.h> 2014-10-09 22:25:46 -04:00
sh Merge git://git.infradead.org/users/eparis/audit 2014-10-19 16:25:56 -07:00
sparc sparc: io: remove duplicate relaxed accessors on sparc32 2014-11-19 10:19:45 +01:00
tile tile: io: implement dummy relaxed accessor macros for writes 2014-10-20 18:49:18 +01:00
um Merge git://git.infradead.org/users/eparis/audit 2014-10-19 16:25:56 -07:00
unicore32 nosave: consolidate __nosave_{begin,end} in <asm/sections.h> 2014-10-09 22:26:04 -04:00
x86 Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into asm-generic 2014-11-11 19:55:45 +01:00
xtensa xtensa: io: remove dummy relaxed accessor macros for reads 2014-10-20 18:49:17 +01:00
.gitignore
Kconfig seccomp: Document two-phase seccomp and arch-provided seccomp_data 2014-09-03 14:58:17 -07:00