From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@hp.com>
Subject: [PATCH] ARCH_HAS_DEV_MEM_MMAP_MEM fix
Date: Thu, 30 Nov 2006 15:36:27 -0700
Message-ID: <1164926187.6117.29.camel@lappy>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org


   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@hp.com>
---

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)
 {