Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6ff290a0c0dec40eb6f80efbb0ac88f518bbb2a7

Authored by Heiko Carstens
Committed by Linus Torvalds
1 parent 6d7bfd14e5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] s390: compile fix: missing defines in asm-s390/io.h 

Compile fix: add missing __raw_read* and __raw_write* defines to
include/asm-s390/io.h.
These are mandatory since patch c27a0d75b33c030965cc97d3d7f571107a673fb4
was merged.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 6 additions and 0 deletions Side-by-side Diff

include/asm-s390/io.h
Diff comments   View file @ 6ff290a
... ... @@ -90,10 +90,16 @@
90 90 #define readb_relaxed(addr) readb(addr)
91 91 #define readw_relaxed(addr) readw(addr)
92 92 #define readl_relaxed(addr) readl(addr)
  93 +#define __raw_readb readb
  94 +#define __raw_readw readw
  95 +#define __raw_readl readl
93 96  
94 97 #define writeb(b,addr) (*(volatile unsigned char *) __io_virt(addr) = (b))
95 98 #define writew(b,addr) (*(volatile unsigned short *) __io_virt(addr) = (b))
96 99 #define writel(b,addr) (*(volatile unsigned int *) __io_virt(addr) = (b))
  100 +#define __raw_writeb writeb
  101 +#define __raw_writew writew
  102 +#define __raw_writel writel
97 103  
98 104 #define memset_io(a,b,c) memset(__io_virt(a),(b),(c))
99 105 #define memcpy_fromio(a,b,c) memcpy((a),__io_virt(b),(c))