[Xen-changelog] [xen-unstable] [IA64] Fix warning when building with CONFIG_FLATMEM unset

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1167949696 25200
# Node ID 8bf7cd060df8d137ed4e189729d63707d5697ddd
# Parent  d9b2dd57fdc4946a0c9b6b1746906b8075df36cf
[IA64] Fix warning when building with CONFIG_FLATMEM unset

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/include/asm-ia64/maddr.h |    1 -
 linux-2.6-xen-sparse/include/asm-ia64/page.h  |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff -r d9b2dd57fdc4 -r 8bf7cd060df8 
linux-2.6-xen-sparse/include/asm-ia64/maddr.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h     Thu Jan 04 15:25:47 
2007 -0700
+++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h     Thu Jan 04 15:28:16 
2007 -0700
@@ -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 d9b2dd57fdc4 -r 8bf7cd060df8 
linux-2.6-xen-sparse/include/asm-ia64/page.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/page.h      Thu Jan 04 15:25:47 
2007 -0700
+++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h      Thu Jan 04 15:28:16 
2007 -0700
@@ -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))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog