[Xen-devel] [PATCH] ARCH_HAS_DEV_MEM_MMAP_MEM fix

[Alex Williamson <alex.williamson@xxxxxx>]

   We can't really define our own mmap_mem external from
driver/xen/char/mem.c as long as drivers/char/mem.c is defining a static
version.  Patch below solves the problem.  Thanks,

        Alex

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---

diff -r 9a410cc14944 linux-2.6-xen-sparse/drivers/char/mem.c
--- a/linux-2.6-xen-sparse/drivers/char/mem.c   Thu Nov 30 13:20:53 2006 -0700
+++ b/linux-2.6-xen-sparse/drivers/char/mem.c   Thu Nov 30 15:28:14 2006 -0700
@@ -249,6 +249,7 @@ static pgprot_t phys_mem_access_prot(str
 }
 #endif
 
+#ifndef ARCH_HAS_DEV_MEM_MMAP_MEM
 static int mmap_mem(struct file * file, struct vm_area_struct * vma)
 {
        size_t size = vma->vm_end - vma->vm_start;
@@ -269,6 +270,7 @@ static int mmap_mem(struct file * file, 
                return -EAGAIN;
        return 0;
 }
+#endif
 
 static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
 {



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