Commit1191ccb34c("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 earliere1039fb426("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")
		
			
				
	
	
		
			21 lines
		
	
	
	
		
			581 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			21 lines
		
	
	
	
		
			581 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
#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
 | 
						|
 */
 | 
						|
 | 
						|
/* Big endian versions of memory read/write routines */
 | 
						|
#define readb_be(__addr)	__raw_readb(__addr)
 | 
						|
#define readw_be(__addr)	__raw_readw(__addr)
 | 
						|
#define readl_be(__addr)	__raw_readl(__addr)
 | 
						|
#define writeb_be(__b, __addr)	__raw_writeb(__b, __addr)
 | 
						|
#define writel_be(__w, __addr)	__raw_writel(__w, __addr)
 | 
						|
#define writew_be(__l, __addr)	__raw_writew(__l, __addr)
 | 
						|
 | 
						|
#endif
 |