commit 05944d74bc28fffbcce159cb915d0acff82f30a1
author Russell King <rmk@dyn-67.arm.linux.org.uk> Thu Nov 30 20:43:51 2006 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat Apr 19 11:36:48 2008 +0100
tree 6151f1a21d7171542ca84906207030d26f9b792d
parent 05dda977f2574c3341abef9b74c27d2b362e1e3a

[ARM] Add initial sparsemem support

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

include/asm-arm/memory.h

diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index d9bfb39..9ba4d71 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -217,7 +217,10 @@
 #ifndef CONFIG_DISCONTIGMEM
 
 #define ARCH_PFN_OFFSET		PHYS_PFN_OFFSET
+
+#ifndef CONFIG_SPARSEMEM
 #define pfn_valid(pfn)		((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
+#endif
 
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr)	((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)