[Xen-changelog] [linux-2.6.18-xen] Revert ARCH_HAS_DEV_MEM change in drivers/xen/char/mem.c

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1183805056 -3600
# Node ID f833757672a70ee43afd0bfbfaa22cec3b132445
# Parent  3ac668c7e1aec4e5a7a572e689adb2dab5b90f8d
Revert ARCH_HAS_DEV_MEM change in drivers/xen/char/mem.c
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 drivers/xen/char/mem.c |    4 ----
 1 files changed, 4 deletions(-)

diff -r 3ac668c7e1ae -r f833757672a7 drivers/xen/char/mem.c
--- a/drivers/xen/char/mem.c    Sat Jul 07 10:19:02 2007 +0100
+++ b/drivers/xen/char/mem.c    Sat Jul 07 11:44:16 2007 +0100
@@ -33,7 +33,6 @@ static inline int valid_phys_addr_range(
 }
 #endif
 
-#ifdef ARCH_HAS_DEV_MEM
 /*
  * This funcion reads the *physical* memory. The f_pos points directly to the 
  * memory location. 
@@ -136,7 +135,6 @@ static ssize_t write_mem(struct file * f
        *ppos += written;
        return written;
 }
-#endif
 
 #ifndef ARCH_HAS_DEV_MEM_MMAP_MEM
 static inline int uncached_access(struct file *file)
@@ -196,7 +194,6 @@ static int open_mem(struct inode * inode
        return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
 }
 
-#ifdef ARCH_HAS_DEV_MEM
 const struct file_operations mem_fops = {
        .llseek         = memory_lseek,
        .read           = read_mem,
@@ -204,4 +201,3 @@ const struct file_operations mem_fops = 
        .mmap           = xen_mmap_mem,
        .open           = open_mem,
 };
-#endif

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog