openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2017-01-27 12:03:00 +01:00
parent 5520b7e7d2
commit b0bd00d6fe
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/boot/header.S
View File

@ -18,7 +18,6 @@
#include <asm/segment.h> #include <asm/segment.h>
#include <generated/utsrelease.h> #include <generated/utsrelease.h>
#include <asm/boot.h> #include <asm/boot.h>
#include <asm/e820/api.h>
#include <asm/page_types.h> #include <asm/page_types.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/bootparam.h> #include <asm/bootparam.h>

5
arch/x86/include/asm/e820/types.h
View File

@ -65,9 +65,6 @@
*/ */
#define E820_RESERVED_KERN 128 #define E820_RESERVED_KERN 128
#ifndef __ASSEMBLY__
#include <linux/types.h>
/* /*
* The whole array of E820 entries: * The whole array of E820 entries:
*/ */
@ -88,6 +85,4 @@ struct e820map {
#define BIOS_ROM_BASE 0xffe00000 #define BIOS_ROM_BASE 0xffe00000
#define BIOS_ROM_END 0xffffffff #define BIOS_ROM_END 0xffffffff
#endif /* __ASSEMBLY__ */
#endif /* _ASM_E820_TYPES_H */ #endif /* _ASM_E820_TYPES_H */