Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

[linux-2.6-omap-h63xx.git] / include / asm-x86 / sparsemem.h

diff --git a/include/asm-x86/sparsemem.h b/include/asm-x86/sparsemem.h
index 3f203b1d9ee8d6dc94dfb6d8326452c3eb5e42ca..38f8e6bc3186bb52ce64245870d651f20c24d6fd 100644 (file)
--- a/include/asm-x86/sparsemem.h
+++ b/include/asm-x86/sparsemem.h
@@ -1,5 +1,34 @@
+#ifndef ASM_X86__SPARSEMEM_H
+#define ASM_X86__SPARSEMEM_H
+
+#ifdef CONFIG_SPARSEMEM
+/*
+ * generic non-linear memory support:
+ *
+ * 1) we will not split memory into more chunks than will fit into the flags
+ *    field of the struct page
+ *
+ * SECTION_SIZE_BITS           2^n: size of each section
+ * MAX_PHYSADDR_BITS           2^n: max size of physical address space
+ * MAX_PHYSMEM_BITS            2^n: how much memory we can have in that space
+ *
+ */
+
 #ifdef CONFIG_X86_32
-# include "sparsemem_32.h"
-#else
-# include "sparsemem_64.h"
+# ifdef CONFIG_X86_PAE
+#  define SECTION_SIZE_BITS    29
+#  define MAX_PHYSADDR_BITS    36
+#  define MAX_PHYSMEM_BITS     36
+# else
+#  define SECTION_SIZE_BITS    26
+#  define MAX_PHYSADDR_BITS    32
+#  define MAX_PHYSMEM_BITS     32
+# endif
+#else /* CONFIG_X86_32 */
+# define SECTION_SIZE_BITS     27 /* matt - 128 is convenient right now */
+# define MAX_PHYSADDR_BITS     44
+# define MAX_PHYSMEM_BITS      44
 #endif
+
+#endif /* CONFIG_SPARSEMEM */
+#endif /* ASM_X86__SPARSEMEM_H */