From: Matthew Wilcox <matthew@wil.cx>
Date: Thu, 16 Nov 2006 20:40:53 +0000 (-0700)
Subject: [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
X-Git-Tag: v2.6.20-rc1~34^2~412^2~2^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0f40ea04a85b077193676cec78a86cd61495680;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed