From: kfraser <kfraser@localhost.localdomain>
Date: Fri, 6 Jul 2007 12:59:15 +0000 (+0100)
Subject: [PPC] Create Xen-specific interface for xlate_dev_mem_*
X-Git-Tag: xen-3.2.0~179^2~18
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=180d0beeb5c355e295cef70c4ef3333a0d4d6266;p=legacy%2Flinux-2.6.18-xen.git

[PPC] Create Xen-specific interface for xlate_dev_mem_*
PowerPC builds both drivers/char/mem.c and drivers/xen/char/mem.c at
once, so we cannot hijack the xlate_dev_mem_ptr() interface.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---

diff --git a/drivers/xen/char/mem.c b/drivers/xen/char/mem.c
index 7e857b22..f21bdccd 100644
--- a/drivers/xen/char/mem.c
+++ b/drivers/xen/char/mem.c
@@ -58,7 +58,7 @@ static ssize_t read_mem(struct file * file, char __user * buf,
 
 		sz = min_t(unsigned long, sz, count);
 
-		v = xlate_dev_mem_ptr(p, sz);
+		v = xen_xlate_dev_mem_ptr(p, sz);
 		if (IS_ERR(v) || v == NULL) {
 			/*
 			 * Some programs (e.g., dmidecode) groove off into
@@ -75,7 +75,7 @@ static ssize_t read_mem(struct file * file, char __user * buf,
 		}
 
 		ignored = copy_to_user(buf, v, sz);
-		xlate_dev_mem_ptr_unmap(v);
+		xen_xlate_dev_mem_ptr_unmap(v);
 		if (ignored)
 			return -EFAULT;
 		buf += sz;
@@ -109,7 +109,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 
 		sz = min_t(unsigned long, sz, count);
 
-		v = xlate_dev_mem_ptr(p, sz);
+		v = xen_xlate_dev_mem_ptr(p, sz);
 		if (v == NULL)
 			break;
 		if (IS_ERR(v)) {
@@ -119,7 +119,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 		}
 
 		ignored = copy_from_user(v, buf, sz);
-		xlate_dev_mem_ptr_unmap(v);
+		xen_xlate_dev_mem_ptr_unmap(v);
 		if (ignored) {
 			written += sz - ignored;
 			if (written)
diff --git a/include/asm-i386/mach-xen/asm/io.h b/include/asm-i386/mach-xen/asm/io.h
index d6e82984..c1c24edc 100644
--- a/include/asm-i386/mach-xen/asm/io.h
+++ b/include/asm-i386/mach-xen/asm/io.h
@@ -53,8 +53,8 @@
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access
  */
-#define xlate_dev_mem_ptr(p, sz)	ioremap(p, sz)
-#define xlate_dev_mem_ptr_unmap(p)	iounmap(p)
+#define xen_xlate_dev_mem_ptr(p, sz)	ioremap(p, sz)
+#define xen_xlate_dev_mem_ptr_unmap(p)	iounmap(p)
 
 /*
  * Convert a virtual cached pointer to an uncached pointer
diff --git a/include/asm-ia64/uaccess.h b/include/asm-ia64/uaccess.h
index e015fd0d..cd4107e9 100644
--- a/include/asm-ia64/uaccess.h
+++ b/include/asm-ia64/uaccess.h
@@ -382,7 +382,7 @@ xlate_dev_mem_ptr (unsigned long p)
 }
 #else
 static __inline__ char *
-xlate_dev_mem_ptr (unsigned long p, ssize_t sz)
+xen_xlate_dev_mem_ptr (unsigned long p, ssize_t sz)
 {
 	unsigned long pfn = p >> PAGE_SHIFT;
 
@@ -393,7 +393,7 @@ xlate_dev_mem_ptr (unsigned long p, ssize_t sz)
 }
 
 static __inline__ void
-xlate_dev_mem_ptr_unmap (char* v)
+xen_xlate_dev_mem_ptr_unmap (char* v)
 {
 	if (REGION_NUMBER(v) == RGN_UNCACHED)
 		iounmap(v);
diff --git a/include/asm-x86_64/mach-xen/asm/io.h b/include/asm-x86_64/mach-xen/asm/io.h
index d92cbd55..31139edb 100644
--- a/include/asm-x86_64/mach-xen/asm/io.h
+++ b/include/asm-x86_64/mach-xen/asm/io.h
@@ -315,8 +315,8 @@ extern int iommu_bio_merge;
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access
  */
-#define xlate_dev_mem_ptr(p, sz)	ioremap(p, sz)
-#define xlate_dev_mem_ptr_unmap(p)	iounmap(p)
+#define xen_xlate_dev_mem_ptr(p, sz)	ioremap(p, sz)
+#define xen_xlate_dev_mem_ptr_unmap(p)	iounmap(p)
 
 /*
  * Convert a virtual cached pointer to an uncached pointer