summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/e820/api.h9
-rw-r--r--arch/x86/include/asm/e820/types.h13
2 files changed, 7 insertions, 15 deletions
diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h
index 010efbceb40c..e161deb5736c 100644
--- a/arch/x86/include/asm/e820/api.h
+++ b/arch/x86/include/asm/e820/api.h
@@ -1,15 +1,6 @@
#ifndef _ASM_E820_API_H
#define _ASM_E820_API_H
-/*
- * E820_X_MAX is the maximum size of the extended E820 table. The extended
- * table may contain up to 3 extra E820 entries per possible NUMA node, so we
- * make room for 3 * MAX_NUMNODES possible entries, beyond the standard 128.
- * Also note that E820_X_MAX *must* be defined before we include asm/e820/types.h.
- */
-#include <linux/numa.h>
-#define E820_X_MAX (E820MAX + 3 * MAX_NUMNODES)
-
#include <asm/e820/types.h>
#ifndef __ASSEMBLY__
diff --git a/arch/x86/include/asm/e820/types.h b/arch/x86/include/asm/e820/types.h
index cf73c104c041..b05e812ff4f2 100644
--- a/arch/x86/include/asm/e820/types.h
+++ b/arch/x86/include/asm/e820/types.h
@@ -3,9 +3,6 @@
#include <uapi/asm/e820/types.h>
-/* Our map: */
-#define E820MAP 0x2d0
-
/*
* The legacy E820 BIOS limits us to 128 (E820MAX) nodes due to the
* constrained space in the zeropage.
@@ -31,9 +28,13 @@
* to allow more than three entries per node or otherwise refine
* this size.
*/
-#ifndef __KERNEL__
-# define E820_X_MAX E820MAX
-#endif
+
+#include <linux/numa.h>
+
+#define E820_X_MAX (E820MAX + 3*MAX_NUMNODES)
+
+/* Our map: */
+#define E820MAP 0x2d0
/* Number of entries in E820MAP: */
#define E820NR 0x1e8