ia64/xen-unstable
changeset 13115:8bf7cd060df8
[IA64] Fix warning when building with CONFIG_FLATMEM unset
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author | awilliam@xenbuild2.aw |
---|---|
date | Thu Jan 04 15:28:16 2007 -0700 (2007-01-04) |
parents | d9b2dd57fdc4 |
children | 5708307d0e35 |
files | linux-2.6-xen-sparse/include/asm-ia64/maddr.h linux-2.6-xen-sparse/include/asm-ia64/page.h |
line diff
1.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h Thu Jan 04 15:25:47 2007 -0700 1.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h Thu Jan 04 15:28:16 2007 -0700 1.3 @@ -68,7 +68,6 @@ machine_to_phys_for_dma(unsigned long ma 1.4 static inline unsigned long 1.5 mfn_to_local_pfn(unsigned long mfn) 1.6 { 1.7 - extern unsigned long max_mapnr; 1.8 unsigned long pfn = mfn_to_pfn_for_dma(mfn); 1.9 if (!pfn_valid(pfn)) 1.10 return INVALID_P2M_ENTRY;
2.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/page.h Thu Jan 04 15:25:47 2007 -0700 2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h Thu Jan 04 15:28:16 2007 -0700 2.3 @@ -105,6 +105,7 @@ extern int ia64_pfn_valid (unsigned long 2.4 #endif 2.5 2.6 #ifdef CONFIG_FLATMEM 2.7 +extern unsigned long max_mapnr; 2.8 # define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) 2.9 # define page_to_pfn(page) ((unsigned long) (page - mem_map)) 2.10 # define pfn_to_page(pfn) (mem_map + (pfn))