diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
commit | c0853867a10f9215132dccdb84c720a5f856f4d2 (patch) | |
tree | 92d3162ea2fc6fe0276dabc869e01293325f862c /arch/x86/kernel/e820.c | |
parent | 6dc390ad61ac8dfca5fa9b0823981fb6f7ec17a0 (diff) | |
parent | 1923f3d02768bd904dfe5607f3f93c3008b8db61 (diff) | |
download | linux-c0853867a10f9215132dccdb84c720a5f856f4d2.tar.bz2 |
Merge branch 'x86/debug' into core/objtool, to pick up frame pointer fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r-- | arch/x86/kernel/e820.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 569c1e4f96fe..b3c2a697820a 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -24,6 +24,7 @@ #include <asm/e820.h> #include <asm/proto.h> #include <asm/setup.h> +#include <asm/cpufeature.h> /* * The e820 map is the map that gets modified e.g. with command line parameters |