ia64/xen-unstable

changeset 15143:e54da168363a

[IA64] Trivial warning fix

contiguous_bitmap_init has implicit declaration

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Fri May 25 09:40:43 2007 -0600 (2007-05-25)
parents 2372c3fbf7d2
children 7a2b4d9cc2da
files linux-2.6-xen-sparse/arch/ia64/kernel/setup.c linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri May 25 09:38:09 2007 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri May 25 09:40:43 2007 -0600
     1.3 @@ -610,7 +610,7 @@ setup_arch (char **cmdline_p)
     1.4  #endif
     1.5  	paging_init();
     1.6  #ifdef CONFIG_XEN
     1.7 -	contiguous_bitmap_init(max_pfn);
     1.8 +	xen_contiguous_bitmap_init(max_pfn);
     1.9  #endif
    1.10  }
    1.11  
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri May 25 09:38:09 2007 -0600
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri May 25 09:40:43 2007 -0600
     2.3 @@ -158,7 +158,7 @@ static void
     2.4  }
     2.5  
     2.6  void
     2.7 -contiguous_bitmap_init(unsigned long end_pfn)
     2.8 +xen_contiguous_bitmap_init(unsigned long end_pfn)
     2.9  {
    2.10  	unsigned long size = (end_pfn + 2 * BITS_PER_LONG) >> 3;
    2.11  #ifndef CONFIG_VIRTUAL_MEM_MAP
     3.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri May 25 09:38:09 2007 -0600
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri May 25 09:40:43 2007 -0600
     3.3 @@ -145,6 +145,7 @@ int privcmd_mmap(struct file * file, str
     3.4  #define pfn_pte_ma(_x,_y)	__pte_ma(0)     /* unmodified use */
     3.5  
     3.6  #ifndef CONFIG_VMX_GUEST
     3.7 +void xen_contiguous_bitmap_init(unsigned long end_pfn);
     3.8  int __xen_create_contiguous_region(unsigned long vstart, unsigned int order, unsigned int address_bits);
     3.9  static inline int
    3.10  xen_create_contiguous_region(unsigned long vstart,