From 0bc8cab53c117a23e9d633c485256c4e7a8eeaf1 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Tue, 11 Mar 2008 20:24:13 +0300
Subject: [PATCH] --- yaml --- r: 91586 b: refs/heads/master c:
 0b51b02edff2417deff98d8bbf294fa56b765bc6 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/powerpc/sysdev/qe_lib/qe.c |  8 +-------
 trunk/include/asm-powerpc/immap_qe.h  |  2 +-
 trunk/include/asm-powerpc/qe.h        | 11 ++++++++++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8b5fb839c697..651774075a4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acaa7aa30a8cdf7276945629f56d6daf30beb157
+refs/heads/master: 0b51b02edff2417deff98d8bbf294fa56b765bc6
diff --git a/trunk/arch/powerpc/sysdev/qe_lib/qe.c b/trunk/arch/powerpc/sysdev/qe_lib/qe.c
index cc81fd1141b0..addabcd443a6 100644
--- a/trunk/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/trunk/arch/powerpc/sysdev/qe_lib/qe.c
@@ -55,7 +55,7 @@ struct qe_snum {
 /* We allocate this here because it is used almost exclusively for
  * the communication processor devices.
  */
-struct qe_immap *qe_immr = NULL;
+struct qe_immap __iomem *qe_immr;
 EXPORT_SYMBOL(qe_immr);
 
 static struct qe_snum snums[QE_NUM_OF_SNUM];	/* Dynamically allocated SNUMs */
@@ -415,12 +415,6 @@ void qe_muram_dump(void)
 }
 EXPORT_SYMBOL(qe_muram_dump);
 
-void *qe_muram_addr(unsigned long offset)
-{
-	return (void *)&qe_immr->muram[offset];
-}
-EXPORT_SYMBOL(qe_muram_addr);
-
 /* The maximum number of RISCs we support */
 #define MAX_QE_RISC     2
 
diff --git a/trunk/include/asm-powerpc/immap_qe.h b/trunk/include/asm-powerpc/immap_qe.h
index 82a452615097..924aefbd6a8e 100644
--- a/trunk/include/asm-powerpc/immap_qe.h
+++ b/trunk/include/asm-powerpc/immap_qe.h
@@ -468,7 +468,7 @@ struct qe_immap {
 	u8			res18[0xC0000];	/* 0x140000 - 0x200000 */
 } __attribute__ ((packed));
 
-extern struct qe_immap *qe_immr;
+extern struct qe_immap __iomem *qe_immr;
 extern phys_addr_t get_qe_base(void);
 
 static inline unsigned long immrbar_virt_to_phys(void *address)
diff --git a/trunk/include/asm-powerpc/qe.h b/trunk/include/asm-powerpc/qe.h
index 430dc77b35fc..398534c15cc7 100644
--- a/trunk/include/asm-powerpc/qe.h
+++ b/trunk/include/asm-powerpc/qe.h
@@ -92,7 +92,16 @@ unsigned long qe_muram_alloc(int size, int align);
 int qe_muram_free(unsigned long offset);
 unsigned long qe_muram_alloc_fixed(unsigned long offset, int size);
 void qe_muram_dump(void);
-void *qe_muram_addr(unsigned long offset);
+
+static inline void __iomem *qe_muram_addr(unsigned long offset)
+{
+	return (void __iomem *)&qe_immr->muram[offset];
+}
+
+static inline unsigned long qe_muram_offset(void __iomem *addr)
+{
+	return addr - (void __iomem *)qe_immr->muram;
+}
 
 /* Structure that defines QE firmware binary files.
  *