diff options
| author | Ingo Molnar <[email protected]> | 2017-01-27 11:46:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-01-28 09:31:14 +0100 |
| commit | 7b6e4ba3cb1ffdf84fc4d3775b922d64663ec6fc (patch) | |
| tree | c7315612bf0736b9dcdbf90edddf0964e3bc43be | |
| parent | 99da1ffe0a85a727c368afa7fc21f7a740477aa4 (diff) | |
x86/boot/e820: Clean up the E820_X_MAX definition
E820_X_MAX is defined in a somewhat messy fashion:
- there's a pretty pointless looking #ifndef __KERNEL__ define that
makes no sense in the non-UAPI header anymore,
- part of it is defined in api.h, which is not for type definitions,
- plus it's defined in two headers and the main explanation is in the
header where we don't have the real definition.
So move it into a single place in e820/types.h and get rid of the
!__KERNEL__ case altogether. Drop the smaller comment - the larger
one explains it just fine.
Note that the zeropage does not use E820_X_MAX, it uses the legacy
128 entries definition.
No change in functionality.
Cc: Alex Thorlton <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Huang, Ying <[email protected]>
Cc: Josh Poimboeuf <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Paul Jackson <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Wei Yang <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | arch/x86/include/asm/e820/api.h | 9 | ||||
| -rw-r--r-- | arch/x86/include/asm/e820/types.h | 13 |
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 |