# HG changeset patch # User yamahata@xxxxxxxxxxxxx # Node ID f7ab7b5765a9c11d15c222d0601121bb3d5d3594 # Parent bf8345ac3d7c5828d2dfe33335ec275e2eb222d6 allow xenLinux to define its own privcmd_mmap(). introduce HAVE_ARCH_PRIVCMD_MMAP. arch which needs its own privcmd_mmap() should define HAVE_ARCH_PRIVCMD_MMAP. xenLinux/ia64 with dom0 vp model needs its own privcmd_mmap(). Signed-off-by: Isaku Yamahata diff -r bf8345ac3d7c -r f7ab7b5765a9 linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Sat Apr 29 14:24:10 2006 +0900 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Sat Apr 29 19:10:38 2006 +0900 @@ -241,6 +241,7 @@ static int privcmd_ioctl(struct inode *i return ret; } +#ifndef HAVE_ARCH_PRIVCMD_MMAP static int privcmd_mmap(struct file * file, struct vm_area_struct * vma) { /* DONTCOPY is essential for Xen as copy_page_range is broken. */ @@ -248,6 +249,7 @@ static int privcmd_mmap(struct file * fi return 0; } +#endif static struct file_operations privcmd_file_ops = { .ioctl = privcmd_ioctl,