From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753131AbdA2AL1 (ORCPT ); Sat, 28 Jan 2017 19:11:27 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36089 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753054AbdA2ALN (ORCPT ); Sat, 28 Jan 2017 19:11:13 -0500 From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Andy Lutomirski , Borislav Petkov , "H . Peter Anvin" , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Yinghai Lu Subject: [PATCH 10/50] x86/boot/e820: Move HIGH_MEMORY define to asm/e820/types.h Date: Sat, 28 Jan 2017 23:11:31 +0100 Message-Id: <1485641531-22124-11-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485641531-22124-1-git-send-email-mingo@kernel.org> References: <1485641531-22124-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dan Williams Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Huang, Ying Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Linus Torvalds Cc: Paul Jackson Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Tejun Heo Cc: Thomas Gleixner Cc: Wei Yang Cc: Yinghai Lu Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- 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 -#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