From: Al Viro <viro@www.linux.org.uk>
To: torvalds@osdl.org
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH] ppc trivial iomem annotations: pmac_smp.c
Date: Sun, 24 Apr 2005 22:31:03 +0100 [thread overview]
Message-ID: <E1DPogx-0004ji-Nj@parcelfarce.linux.theplanet.co.uk> (raw)
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC12-rc3-pmac_time/arch/ppc/platforms/pmac_smp.c RC12-rc3-pmac_smp/arch/ppc/platforms/pmac_smp.c
--- RC12-rc3-pmac_time/arch/ppc/platforms/pmac_smp.c Wed Apr 20 21:25:28 2005
+++ RC12-rc3-pmac_smp/arch/ppc/platforms/pmac_smp.c Sun Apr 24 16:20:04 2005
@@ -91,11 +91,11 @@
#define PSURGE_QUAD_BIC(r, v) (PSURGE_QUAD_OUT((r), PSURGE_QUAD_IN(r) & ~(v)))
/* virtual addresses for the above */
-static volatile u8 *hhead_base;
-static volatile u8 *quad_base;
-static volatile u32 *psurge_pri_intr;
-static volatile u8 *psurge_sec_intr;
-static volatile u32 *psurge_start;
+static volatile u8 __iomem *hhead_base;
+static volatile u8 __iomem *quad_base;
+static volatile u32 __iomem *psurge_pri_intr;
+static volatile u8 __iomem *psurge_sec_intr;
+static volatile u32 __iomem *psurge_start;
/* values for psurge_type */
#define PSURGE_NONE -1
@@ -322,10 +322,10 @@
/* All released cards using this HW design have 4 CPUs */
ncpus = 4;
} else {
- iounmap((void *) quad_base);
+ iounmap(quad_base);
if ((in_8(hhead_base + HHEAD_CONFIG) & 0x02) == 0) {
/* not a dual-cpu card */
- iounmap((void *) hhead_base);
+ iounmap(hhead_base);
psurge_type = PSURGE_NONE;
return 1;
}
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=E1DPogx-0004ji-Nj@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