diff options
| author | Ingo Molnar <[email protected]> | 2017-01-27 12:03:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-01-28 09:31:15 +0100 |
| commit | b0bd00d6feabdce70c89b298317309d2f12ceba4 (patch) | |
| tree | af83700a11e91e90590b98f3b4127a1a304dc744 | |
| parent | 5520b7e7d2d20ae2ab6e07b46c42cd43df9d2799 (diff) | |
x86/boot/e820: Remove assembly guard from asm/e820/types.h
There's an assembly guard in asm/e820/types.h, and only
a single .S file includes this header: arch/x86/boot/header.S,
but it does not actually make use of any of the E820 defines.
Remove the inclusion and remove the assembly guard as well.
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/boot/header.S | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/e820/types.h | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 398b290c4c00..2ed8f0c25def 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -18,7 +18,6 @@ #include <asm/segment.h> #include <generated/utsrelease.h> #include <asm/boot.h> -#include <asm/e820/api.h> #include <asm/page_types.h> #include <asm/setup.h> #include <asm/bootparam.h> diff --git a/arch/x86/include/asm/e820/types.h b/arch/x86/include/asm/e820/types.h index b05e812ff4f2..464cfe827396 100644 --- a/arch/x86/include/asm/e820/types.h +++ b/arch/x86/include/asm/e820/types.h @@ -65,9 +65,6 @@ */ #define E820_RESERVED_KERN 128 -#ifndef __ASSEMBLY__ -#include <linux/types.h> - /* * The whole array of E820 entries: */ @@ -88,6 +85,4 @@ struct e820map { #define BIOS_ROM_BASE 0xffe00000 #define BIOS_ROM_END 0xffffffff -#endif /* __ASSEMBLY__ */ - #endif /* _ASM_E820_TYPES_H */ |