From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 9 Oct 2008 20:31:56 +0000 (+0100)
Subject: Merge branch 'ptebits' into devel
X-Git-Tag: v2.6.28-rc1~293^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6a4690c22f5da1eb1c898b61b6a80da52fbd976f;p=linux.git

Merge branch 'ptebits' into devel

Conflicts:

	arch/arm/Kconfig
---

6a4690c22f5da1eb1c898b61b6a80da52fbd976f
diff --cc arch/arm/Kconfig
index ea52fae33290,70dba1668907..744d07e69602
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -843,9 -810,19 +843,14 @@@ config OABI_COMPA
  	  UNPREDICTABLE (in fact it can be predicted that it won't work
  	  at all). If in doubt say Y.
  
+ config ARCH_FLATMEM_HAS_HOLES
+ 	bool
+ 	default y
+ 	depends on FLATMEM
+ 
 +# Discontigmem is deprecated
  config ARCH_DISCONTIGMEM_ENABLE
  	bool
 -	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
 -	help
 -	  Say Y to support efficient handling of discontiguous physical memory,
 -	  for architectures which are either NUMA (Non-Uniform Memory Access)
 -	  or have huge holes in the physical address space for other reasons.
 -	  See <file:Documentation/vm/numa> for more.
  
  config ARCH_SPARSEMEM_ENABLE
  	bool