[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>

diff --git a/arch/ppc/platforms/chrp_pci.c b/arch/ppc/platforms/chrp_pci.c
index 5bb6492ecf8cc816d90d0b6499e97429e991d873..7d0ee308f662c7247c72f60484f58277a938b190 100644 (file)
--- a/arch/ppc/platforms/chrp_pci.c
+++ b/arch/ppc/platforms/chrp_pci.c
@@ -129,7 +129,7 @@ static struct pci_ops rtas_pci_ops =
        rtas_write_config
 };
 
-volatile struct Hydra *Hydra = NULL;
+volatile struct Hydra __iomem *Hydra = NULL;
 
 int __init
 hydra_init(void)
@@ -175,13 +175,14 @@ chrp_pcibios_fixup(void)
 static void __init
 setup_python(struct pci_controller *hose, struct device_node *dev)
 {
-       u32 *reg, val;
+       u32 __iomem *reg;
+       u32 val;
        unsigned long addr = dev->addrs[0].address;
 
        setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010);
 
        /* Clear the magic go-slow bit */
-       reg = (u32 *) ioremap(dev->addrs[0].address + 0xf6000, 0x40);
+       reg = ioremap(dev->addrs[0].address + 0xf6000, 0x40);
        val = in_be32(&reg[12]);
        if (val & PRG_CL_RESET_VALID) {
                out_be32(&reg[12], val & ~PRG_CL_RESET_VALID);

diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c
index f23c4f3207605ae4ac13bdaac259a61c698f0e0f..57f29ab29bdae072f6f25090f3f4952b401e8e71 100644 (file)
--- a/arch/ppc/platforms/chrp_setup.c
+++ b/arch/ppc/platforms/chrp_setup.c
@@ -356,7 +356,7 @@ static void __init chrp_find_openpic(void)
        struct device_node *np;
        int len, i;
        unsigned int *iranges;
-       void *isu;
+       void __iomem *isu;
 
        np = find_type_devices("open-pic");
        if (np == NULL || np->n_addrs == 0)

diff --git a/include/asm-ppc/hydra.h b/include/asm-ppc/hydra.h
index 1134431431da6654c75c23f2a783482e34aa0712..833a8aff2a80cc7b9f768d701c5adb302beb486e 100644 (file)
--- a/include/asm-ppc/hydra.h
+++ b/include/asm-ppc/hydra.h
@@ -51,7 +51,7 @@ struct Hydra {
     char OpenPIC[0x40000];
 };
 
-extern volatile struct Hydra *Hydra;
+extern volatile struct Hydra __iomem *Hydra;
 
 
     /*