mirror of https://gitee.com/openkylin/linux.git
x86/boot/e820: Remove unnecessary __ASSEMBLY__ guard
asm/e820/api.h had a spurious __ASSEMBLY__ guard - but the API header is not included in any assembly files. Remove it. 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:
parent
0f856508ad
commit
993f4b77aa
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <asm/e820/types.h>
|
#include <asm/e820/types.h>
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
/* see comment in arch/x86/kernel/e820.c */
|
/* see comment in arch/x86/kernel/e820.c */
|
||||||
extern struct e820map *e820;
|
extern struct e820map *e820;
|
||||||
extern struct e820map *e820_saved;
|
extern struct e820map *e820_saved;
|
||||||
|
@ -47,7 +46,6 @@ static inline bool is_ISA_range(u64 start, u64 end)
|
||||||
return start >= ISA_START_ADDRESS && end <= ISA_END_ADDRESS;
|
return start >= ISA_START_ADDRESS && end <= ISA_END_ADDRESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
|
|
||||||
#define HIGH_MEMORY (1024*1024)
|
#define HIGH_MEMORY (1024*1024)
|
||||||
|
|
Loading…
Reference in New Issue