]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
authorMatthew Wilcox <matthew@wil.cx>
Thu, 16 Nov 2006 20:40:53 +0000 (13:40 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 7 Dec 2006 19:24:03 +0000 (11:24 -0800)
commitb0f40ea04a85b077193676cec78a86cd61495680
tree7aa835fa46850638800507d27b52d834599988c6
parent17e77b1cc31454908aa286bb1db3c611295ce25c
[IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP

make allnoconfig currently fails to build because it selects DISCONTIGMEM
without VIRTUAL_MEM_MAP.  I see no particular reason this combination
ought to fail, so I fixed it by:

 - Including memory_model.h in all circumstances, except when both
   DISCONTIGMEM and VIRTUAL_MEM_MAP are enabled.
 - Defining ia64_pfn_valid() to 1 unless VIRTUAL_MEM_MAP is enabled

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Tony Luck <tony.luck@intel.com>
include/asm-ia64/page.h