]> git.baikalelectronics.ru Git - kernel.git/commit
sparc: io: remove duplicate relaxed accessors on sparc32
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 09:15:33 +0000 (10:15 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 09:19:45 +0000 (10:19 +0100)
commit8655cabf12153cf62008d77ead30ff33cb504777
tree02fe65202718b5c7ff2421cfff2e1431a8fe3713
parent55bdd97bd02813fec16cb8a8d3a792ec62c44d74
sparc: io: remove duplicate relaxed accessors on sparc32

Commit 936aa63dab35 ("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
19aa58cd806d ("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: 936aa63dab35 ("sparc: io: implement dummy relaxed accessor macros for writes")
arch/sparc/include/asm/io.h
arch/sparc/include/asm/io_64.h