Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] ppc trivial iomem annotations: pmac_smp.c

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Viro and committed by
Linus Torvalds
8e293ada e2178f19

+7 -7
+7 -7
arch/ppc/platforms/pmac_smp.c
··· 91 91 #define PSURGE_QUAD_BIC(r, v) (PSURGE_QUAD_OUT((r), PSURGE_QUAD_IN(r) & ~(v))) 92 92 93 93 /* virtual addresses for the above */ 94 - static volatile u8 *hhead_base; 95 - static volatile u8 *quad_base; 96 - static volatile u32 *psurge_pri_intr; 97 - static volatile u8 *psurge_sec_intr; 98 - static volatile u32 *psurge_start; 94 + static volatile u8 __iomem *hhead_base; 95 + static volatile u8 __iomem *quad_base; 96 + static volatile u32 __iomem *psurge_pri_intr; 97 + static volatile u8 __iomem *psurge_sec_intr; 98 + static volatile u32 __iomem *psurge_start; 99 99 100 100 /* values for psurge_type */ 101 101 #define PSURGE_NONE -1 ··· 322 322 /* All released cards using this HW design have 4 CPUs */ 323 323 ncpus = 4; 324 324 } else { 325 - iounmap((void *) quad_base); 325 + iounmap(quad_base); 326 326 if ((in_8(hhead_base + HHEAD_CONFIG) & 0x02) == 0) { 327 327 /* not a dual-cpu card */ 328 - iounmap((void *) hhead_base); 328 + iounmap(hhead_base); 329 329 psurge_type = PSURGE_NONE; 330 330 return 1; 331 331 }