[Xen-changelog] [xen-unstable] [LINUX] dev/mem: Rename Xen's mmap_mem to xen_mmap_mem to

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID b334f479853e9516707afbdeaf47372017564dab
# Parent  4ede29160b534da74024f98d3e006cf0ecdc573b
[LINUX] dev/mem: Rename Xen's mmap_mem to xen_mmap_mem to
avoid conflict with the definition (which still exists and
is used) in drivers/char/mem.c.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/char/mem.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 4ede29160b53 -r b334f479853e linux-2.6-xen-sparse/drivers/xen/char/mem.c
--- a/linux-2.6-xen-sparse/drivers/xen/char/mem.c       Fri Dec 01 13:25:33 
2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/char/mem.c       Fri Dec 01 13:44:33 
2006 +0000
@@ -147,7 +147,7 @@ static inline int uncached_access(struct
        return 0;
 }
 
-static int mmap_mem(struct file * file, struct vm_area_struct * vma)
+static int xen_mmap_mem(struct file * file, struct vm_area_struct * vma)
 {
        size_t size = vma->vm_end - vma->vm_start;
 
@@ -200,6 +200,6 @@ struct file_operations mem_fops = {
        .llseek         = memory_lseek,
        .read           = read_mem,
        .write          = write_mem,
-       .mmap           = mmap_mem,
+       .mmap           = xen_mmap_mem,
        .open           = open_mem,
 };

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