Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754971AbcK3DZY (ORCPT ); Tue, 29 Nov 2016 22:25:24 -0500 Received: from relay2.sgi.com ([192.48.180.65]:58768 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755359AbcK3DYv (ORCPT ); Tue, 29 Nov 2016 22:24:51 -0500 From: Alex Thorlton To: linux-kernel@vger.kernel.org Cc: Alex Thorlton , Russ Anderson , David Vrabel , Ingo Molnar , Juergen Gross , Thomas Gleixner , "H. Peter Anvin" , Denys Vlasenko , Boris Ostrovsky , x86@kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH 1/2] x86: Make E820_X_MAX unconditionally larger than E820MAX Date: Tue, 29 Nov 2016 21:24:46 -0600 Message-Id: <1480476287-232878-2-git-send-email-athorlton@sgi.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1480476287-232878-1-git-send-email-athorlton@sgi.com> References: <1479168677-23633-1-git-send-email-athorlton@sgi.com> <1480476287-232878-1-git-send-email-athorlton@sgi.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1718 Lines: 52 It's really not necessary to limit E820_X_MAX to 128 in the non-EFI case. This commit drops E820_X_MAX's dependency on CONFIG_EFI, so that E820_X_MAX is always at least slightly larger than E820MAX. The real motivation behind this is actually to prevent some issues in the Xen kernel, where the XENMEM_machine_memory_map hypercall can produce an e820 map larger than 128 entries, even on systems where the original e820 table was quite a bit smaller than that, depending on how many IOAPICs are installed on the system. Signed-off-by: Alex Thorlton Suggested-by: Ingo Molnar Cc: Russ Anderson Cc: David Vrabel Cc: Ingo Molnar Cc: Juergen Gross Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Denys Vlasenko Cc: Boris Ostrovsky Cc: x86@kernel.org Cc: xen-devel@lists.xenproject.org --- arch/x86/include/asm/e820.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 476b574..aa00d33 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h @@ -1,13 +1,15 @@ #ifndef _ASM_X86_E820_H #define _ASM_X86_E820_H -#ifdef CONFIG_EFI +/* + * We need to make sure that E820_X_MAX is defined + * before we include uapi/asm/e820.h + */ #include #define E820_X_MAX (E820MAX + 3 * MAX_NUMNODES) -#else /* ! CONFIG_EFI */ -#define E820_X_MAX E820MAX -#endif + #include + #ifndef __ASSEMBLY__ /* see comment in arch/x86/kernel/e820.c */ extern struct e820map *e820; -- 1.8.5.6