diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-27 12:49:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:33:14 +0100 |
| commit | 308bee698a902dac1d724277e636cd5f9be8cd3b (patch) | |
| tree | 0f53cb8ee79ad7d5454a3d7a9a49495c2aa2f5b0 /arch/x86/include/asm/e820 | |
| parent | 993f4b77aa77eceda61e77c2d8645363181fa4ce (diff) | |
x86/boot/e820: Move HIGH_MEMORY define to asm/e820/types.h
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 <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>
Diffstat (limited to 'arch/x86/include/asm/e820')
| -rw-r--r-- | arch/x86/include/asm/e820/api.h | 1 | ||||
| -rw-r--r-- | 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 |