# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1180071116 -32400
# Node ID a5bef0dea7c72ea200483fc61aa2ada11cdf45cf
# Parent  64f7d76af7f9e8424cfb30fab38ce22fbc9ae5f0
trivial warning fix.
  CC      arch/ia64/kernel/setup.o
/src1/yamahata/hg/xen/ia64/my157/compile/test-0/xen-ia64-unstable.hg/linux-2.6.18-xen/arch/ia64/kernel/setup.c: In function `setup_arch':
/src1/yamahata/hg/xen/ia64/my157/compile/test-0/xen-ia64-unstable.hg/linux-2.6.18-xen/arch/ia64/kernel/setup.c:613: warning: implicit declaration of function `contiguous_bitmap_init'
PATCHNAME: trivial_warning_remove

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 64f7d76af7f9 -r a5bef0dea7c7 linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri May 25 18:39:35 2007 +0900
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri May 25 14:31:56 2007 +0900
@@ -610,7 +610,7 @@ setup_arch (char **cmdline_p)
 #endif
 	paging_init();
 #ifdef CONFIG_XEN
-	contiguous_bitmap_init(max_pfn);
+	xen_contiguous_bitmap_init(max_pfn);
 #endif
 }
 
diff -r 64f7d76af7f9 -r a5bef0dea7c7 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri May 25 18:39:35 2007 +0900
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri May 25 14:31:56 2007 +0900
@@ -158,7 +158,7 @@ __contiguous_bitmap_init(unsigned long s
 }
 
 void
-contiguous_bitmap_init(unsigned long end_pfn)
+xen_contiguous_bitmap_init(unsigned long end_pfn)
 {
 	unsigned long size = (end_pfn + 2 * BITS_PER_LONG) >> 3;
 #ifndef CONFIG_VIRTUAL_MEM_MAP
diff -r 64f7d76af7f9 -r a5bef0dea7c7 linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri May 25 18:39:35 2007 +0900
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri May 25 14:31:56 2007 +0900
@@ -145,6 +145,7 @@ int privcmd_mmap(struct file * file, str
 #define pfn_pte_ma(_x,_y)	__pte_ma(0)     /* unmodified use */
 
 #ifndef CONFIG_VMX_GUEST
+void xen_contiguous_bitmap_init(unsigned long end_pfn);
 int __xen_create_contiguous_region(unsigned long vstart, unsigned int order, unsigned int address_bits);
 static inline int
 xen_create_contiguous_region(unsigned long vstart,