ia64/xen-unstable

changeset 12743:b334f479853e

[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@xensource.com>
author kfraser@localhost.localdomain
date Fri Dec 01 13:44:33 2006 +0000 (2006-12-01)
parents 4ede29160b53
children d0ade847f886
files linux-2.6-xen-sparse/drivers/xen/char/mem.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/char/mem.c	Fri Dec 01 13:25:33 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/char/mem.c	Fri Dec 01 13:44:33 2006 +0000
     1.3 @@ -147,7 +147,7 @@ static inline int uncached_access(struct
     1.4  	return 0;
     1.5  }
     1.6  
     1.7 -static int mmap_mem(struct file * file, struct vm_area_struct * vma)
     1.8 +static int xen_mmap_mem(struct file * file, struct vm_area_struct * vma)
     1.9  {
    1.10  	size_t size = vma->vm_end - vma->vm_start;
    1.11  
    1.12 @@ -200,6 +200,6 @@ struct file_operations mem_fops = {
    1.13  	.llseek		= memory_lseek,
    1.14  	.read		= read_mem,
    1.15  	.write		= write_mem,
    1.16 -	.mmap		= mmap_mem,
    1.17 +	.mmap		= xen_mmap_mem,
    1.18  	.open		= open_mem,
    1.19  };