[IA64] Fix warning when building with CONFIG_FLATMEM unset

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

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 cbdef5a96ece2ba9eaebfc28e80ed39c9306c8d5..cacad452d8340fd8a759ddecab6d8c3719e1d0ae 100644 (file)
--- 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 fca73f00ef9261f6481bb68a8763b8d167ca2428..c161dc3aeb1b96b78fe6427b139910222c483969 100644 (file)
--- 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))