| commit | 7c3969c3a4f3593bf7963355e10401a8638cb1cb | |
| author | Arnd Bergmann <arnd@arndb.de> | |
| Wed, 19 Nov 2014 09:15:33 +0000 (19 10:15 +0100) | ||
| committer | Arnd Bergmann <arnd@arndb.de> | |
| Wed, 19 Nov 2014 09:19:45 +0000 (19 10:19 +0100) | ||
| tree | 02fe65202718b5c7ff2421cfff2e1431a8fe3713 | treesnapshot (tar.gz zip) |
| parent | 1c8d29696f0d79902962526d6c54ebfeb842c61d | commitdiff |
sparc: io: remove duplicate relaxed accessors on sparc32
Commit 1191ccb34cf8 ("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
e1039fb42609 ("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: 1191ccb34cf8 ("sparc: io: implement dummy relaxed accessor macros for writes")
Commit 1191ccb34cf8 ("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
e1039fb42609 ("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: 1191ccb34cf8 ("sparc: io: implement dummy relaxed accessor macros for writes")
| arch/sparc/include/asm/io.h | diffblobblamehistory | |
| arch/sparc/include/asm/io_64.h | diffblobblamehistory |