From: Al Viro <viro@www.linux.org.uk>
To: torvalds@osdl.org
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH] ppc trivial iomem annotations: chrp
Date: Sun, 24 Apr 2005 22:31:13 +0100 [thread overview]
Message-ID: <E1DPoh7-0004k7-Ow@parcelfarce.linux.theplanet.co.uk> (raw)
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC12-rc3-pmac_smp/arch/ppc/platforms/chrp_pci.c RC12-rc3-chrp/arch/ppc/platforms/chrp_pci.c
--- RC12-rc3-pmac_smp/arch/ppc/platforms/chrp_pci.c Fri Mar 11 15:54:45 2005
+++ RC12-rc3-chrp/arch/ppc/platforms/chrp_pci.c Sun Apr 24 16:20:05 2005
@@ -129,7 +129,7 @@
rtas_write_config
};
-volatile struct Hydra *Hydra = NULL;
+volatile struct Hydra __iomem *Hydra = NULL;
int __init
hydra_init(void)
@@ -175,13 +175,14 @@
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(®[12]);
if (val & PRG_CL_RESET_VALID) {
out_be32(®[12], val & ~PRG_CL_RESET_VALID);
diff -urN RC12-rc3-pmac_smp/arch/ppc/platforms/chrp_setup.c RC12-rc3-chrp/arch/ppc/platforms/chrp_setup.c
--- RC12-rc3-pmac_smp/arch/ppc/platforms/chrp_setup.c Wed Apr 20 21:25:28 2005
+++ RC12-rc3-chrp/arch/ppc/platforms/chrp_setup.c Sun Apr 24 16:20:05 2005
@@ -356,7 +356,7 @@
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 -urN RC12-rc3-pmac_smp/include/asm-ppc/hydra.h RC12-rc3-chrp/include/asm-ppc/hydra.h
--- RC12-rc3-pmac_smp/include/asm-ppc/hydra.h Wed Feb 4 09:34:02 2004
+++ RC12-rc3-chrp/include/asm-ppc/hydra.h Sun Apr 24 16:20:05 2005
@@ -51,7 +51,7 @@
char OpenPIC[0x40000];
};
-extern volatile struct Hydra *Hydra;
+extern volatile struct Hydra __iomem *Hydra;
/*
reply other threads:[~2005-04-24 21:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1DPoh7-0004k7-Ow@parcelfarce.linux.theplanet.co.uk \
--to=viro@www.linux.org.uk \
--cc=linuxppc-dev@ozlabs.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox