# HG changeset patch # User yamahata@xxxxxxxxxxxxx # Date 1166620019 -32400 # Node ID e4195cf98e69da255fa9705194a6b3c59d3337fd # Parent 0c823791df8d9dd9fa1d6d94e0103d6bfe58a204 remove warning when !CONFIG_FLATMEM moving max_mapnr declaration. PATCHNAME: max_mapnr_config_flatmem Signed-off-by: Isaku Yamahata diff -r 0c823791df8d -r e4195cf98e69 linux-2.6-xen-sparse/include/asm-ia64/maddr.h --- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h Wed Dec 20 21:58:05 2006 +0900 +++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h Wed Dec 20 22:06:59 2006 +0900 @@ -68,7 +68,6 @@ static inline unsigned long 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 -r 0c823791df8d -r e4195cf98e69 linux-2.6-xen-sparse/include/asm-ia64/page.h --- a/linux-2.6-xen-sparse/include/asm-ia64/page.h Wed Dec 20 21:58:05 2006 +0900 +++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h Wed Dec 20 22:06:59 2006 +0900 @@ -105,6 +105,7 @@ extern int ia64_pfn_valid (unsigned long #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))