vserver 1.9.5.x5

[linux-2.6.git] / include / asm-x86_64 / mmzone.h

diff --git a/include/asm-x86_64/mmzone.h b/include/asm-x86_64/mmzone.h
index 53c6217..d95b7c2 100644 (file)
--- a/include/asm-x86_64/mmzone.h
+++ b/include/asm-x86_64/mmzone.h
@@ -12,7 +12,6 @@
 
 #include <asm/smp.h>
 
-#define MAXNODE 8 
 #define NODEMAPSIZE 0xff
 
 /* Simple perfect hash to map physical addresses to node numbers */
@@ -57,9 +56,8 @@ static inline __attribute__((pure)) int phys_to_nid(unsigned long addr)
 #define page_to_pfn(page) \
        (long)(((page) - page_zone(page)->zone_mem_map) + page_zone(page)->zone_start_pfn)
 
-/* AK: !DISCONTIGMEM just forces it to 1. Can't we too? */
-#define pfn_valid(pfn)          ((pfn) < num_physpages)
-
-
+#define pfn_valid(pfn) ((pfn) >= num_physpages ? 0 : \
+                       ({ u8 nid__ = pfn_to_nid(pfn); \
+                          nid__ != 0xff && (pfn) >= node_start_pfn(nid__) && (pfn) <= node_end_pfn(nid__); }))
 #endif
 #endif