The HIGH_MEMORY define was in the API header, while it conceptually belongs to the other physical memory ranges in the e820/types.h header.
Move it there - and also convert the 1MB address to hexa, so that it lines up more nicely with the other memory address values. 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]> --- arch/x86/include/asm/e820/api.h | 1 - arch/x86/include/asm/e820/types.h | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index b45550b662a9..4163a83f1a37 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -48,5 +48,4 @@ static inline bool is_ISA_range(u64 start, u64 end) #include <linux/ioport.h> -#define HIGH_MEMORY (1024*1024) #endif /* _ASM_E820_API_H */ diff --git a/arch/x86/include/asm/e820/types.h b/arch/x86/include/asm/e820/types.h index 464cfe827396..ce0e100b843c 100644 --- a/arch/x86/include/asm/e820/types.h +++ b/arch/x86/include/asm/e820/types.h @@ -74,7 +74,7 @@ struct e820map { }; /* - * Various legacy ranges in physical memory: + * Various well-known legacy memory ranges in physical memory: */ #define ISA_START_ADDRESS 0x000a0000 #define ISA_END_ADDRESS 0x00100000 @@ -82,6 +82,8 @@ struct e820map { #define BIOS_BEGIN 0x000a0000 #define BIOS_END 0x00100000 +#define HIGH_MEMORY 0x00100000 + #define BIOS_ROM_BASE 0xffe00000 #define BIOS_ROM_END 0xffffffff -- 2.7.4
