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

[PATCH] ppc trivial iomem annotations: chrp

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
e2178f19 28a68159

+6 -5
+4 -3
arch/ppc/platforms/chrp_pci.c
··· 129 129 rtas_write_config 130 130 }; 131 131 132 - volatile struct Hydra *Hydra = NULL; 132 + volatile struct Hydra __iomem *Hydra = NULL; 133 133 134 134 int __init 135 135 hydra_init(void) ··· 175 175 static void __init 176 176 setup_python(struct pci_controller *hose, struct device_node *dev) 177 177 { 178 - u32 *reg, val; 178 + u32 __iomem *reg; 179 + u32 val; 179 180 unsigned long addr = dev->addrs[0].address; 180 181 181 182 setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010); 182 183 183 184 /* Clear the magic go-slow bit */ 184 - reg = (u32 *) ioremap(dev->addrs[0].address + 0xf6000, 0x40); 185 + reg = ioremap(dev->addrs[0].address + 0xf6000, 0x40); 185 186 val = in_be32(&reg[12]); 186 187 if (val & PRG_CL_RESET_VALID) { 187 188 out_be32(&reg[12], val & ~PRG_CL_RESET_VALID);
+1 -1
arch/ppc/platforms/chrp_setup.c
··· 356 356 struct device_node *np; 357 357 int len, i; 358 358 unsigned int *iranges; 359 - void *isu; 359 + void __iomem *isu; 360 360 361 361 np = find_type_devices("open-pic"); 362 362 if (np == NULL || np->n_addrs == 0)
+1 -1
include/asm-ppc/hydra.h
··· 51 51 char OpenPIC[0x40000]; 52 52 }; 53 53 54 - extern volatile struct Hydra *Hydra; 54 + extern volatile struct Hydra __iomem *Hydra; 55 55 56 56 57 57 /*