From: awilliam@xenbuild2.aw Date: Thu, 4 Jan 2007 22:28:16 +0000 (-0700) Subject: [IA64] Fix warning when building with CONFIG_FLATMEM unset X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15432 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a0fab920c59bcbd138b309b85790c6435628db9b;p=xen.git [IA64] Fix warning when building with CONFIG_FLATMEM unset Signed-off-by: Isaku Yamahata --- diff --git a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h index cbdef5a96e..cacad452d8 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h @@ -68,7 +68,6 @@ machine_to_phys_for_dma(unsigned long machine) static inline unsigned long mfn_to_local_pfn(unsigned long mfn) { - extern unsigned long max_mapnr; unsigned long pfn = mfn_to_pfn_for_dma(mfn); if (!pfn_valid(pfn)) return INVALID_P2M_ENTRY; diff --git a/linux-2.6-xen-sparse/include/asm-ia64/page.h b/linux-2.6-xen-sparse/include/asm-ia64/page.h index fca73f00ef..c161dc3aeb 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/page.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h @@ -105,6 +105,7 @@ extern int ia64_pfn_valid (unsigned long pfn); #endif #ifdef CONFIG_FLATMEM +extern unsigned long max_mapnr; # define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) # define page_to_pfn(page) ((unsigned long) (page - mem_map)) # define pfn_to_page(pfn) (mem_map + (pfn))