diff options
| author | Paul Jackson <pj@sgi.com> | 2004-09-07 07:36:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-07 07:36:57 -0700 |
| commit | 2a96c525390e4e11f584b9f138c676f605ee6dec (patch) | |
| tree | ea3faf43d4ad0df671677e3c692d82966f9ece1d /include | |
| parent | 887813f98542bd6d51f8b87f3ce2790bd5135e0f (diff) | |
[PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM
The change on 2004-09-03 by ianw@gelato.unsw.edu.au appears to have
a typo, which causes builds of configurations which define both
CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM to emit some 890
warnings for redefines of each of pfn_valid, page_to_pfn,
pfn_to_page.
This shows up compiling sn2_defconfig, the SN2 config of arch ia64. I
believe that this is a simply typo, an extra "#else" line. Removing
this exta line enables sn2_defconfig to build as before.
Acked by Jesse Barnes <jbarnes@engr.sgi.com>
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/page.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index b5b278f584d2..9352301938b8 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -90,7 +90,6 @@ extern struct page *vmem_map; # define page_to_pfn(page) ((unsigned long) (page - vmem_map)) # define pfn_to_page(pfn) (vmem_map + (pfn)) # endif -#else /* !CONFIG_VIRTUAL_MEM_MAP */ #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)) |