lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ppc trivial iomem annotations: pmac_smp.c

Browse Source 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2005-04-24 14:58:08 -07:00
committed by Linus Torvalds
parent e2178f199b
commit 8e293ada7d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/ppc/platforms/pmac_smp.c
View File

@@ -91,11 +91,11 @@ extern void __secondary_start_psurge3(void); /* Temporary horrible hack */
#define PSURGE_QUAD_BIC(r, v) (PSURGE_QUAD_OUT((r), PSURGE_QUAD_IN(r) & ~(v))) #define PSURGE_QUAD_BIC(r, v) (PSURGE_QUAD_OUT((r), PSURGE_QUAD_IN(r) & ~(v)))
/* virtual addresses for the above */ /* virtual addresses for the above */
static volatile u8 *hhead_base; static volatile u8 __iomem *hhead_base;
static volatile u8 *quad_base; static volatile u8 __iomem *quad_base;
static volatile u32 *psurge_pri_intr; static volatile u32 __iomem *psurge_pri_intr;
static volatile u8 *psurge_sec_intr; static volatile u8 __iomem *psurge_sec_intr;
static volatile u32 *psurge_start; static volatile u32 __iomem *psurge_start;
/* values for psurge_type */ /* values for psurge_type */
#define PSURGE_NONE -1 #define PSURGE_NONE -1
@@ -322,10 +322,10 @@ static int __init smp_psurge_probe(void)
/* All released cards using this HW design have 4 CPUs */ /* All released cards using this HW design have 4 CPUs */
ncpus = 4; ncpus = 4;
} else { } else {
iounmap((void *) quad_base); iounmap(quad_base);
if ((in_8(hhead_base + HHEAD_CONFIG) & 0x02) == 0) { if ((in_8(hhead_base + HHEAD_CONFIG) & 0x02) == 0) {
/* not a dual-cpu card */ /* not a dual-cpu card */
iounmap((void *) hhead_base); iounmap(hhead_base);
psurge_type = PSURGE_NONE; psurge_type = PSURGE_NONE;
return 1; return 1;
} }