From 91304aa707ef68c92bb9ae3651b1b7e9808caab7 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 5 Mar 2008 11:48:34 -0300 Subject: [PATCH] xen x86_64: Remove the 640K-1M hole and disable DMI (TEMPORARY) On 64-bit, we don't have the LOWMEM and HIGHMEM macros. As I think using the LOWMEM and HIGHMEM macros on 64-bit would be ugly, I am disabling the hole temporarily, until I understand the DMI problem properly. Instead, for now, just disable CONFIG_DMI under CONFIG_XEN. Signed-off-by: Eduardo Habkost Signed-off-by: Mark McLoughlin --- arch/x86/Kconfig | 2 +- arch/x86/xen/setup.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6c70fed..3daae55 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -89,7 +89,7 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y config DMI - def_bool y + def_bool !XEN config RWSEM_GENERIC_SPINLOCK def_bool !X86_XADD diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 2341492..d42586d 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -38,8 +38,12 @@ char * __init xen_memory_setup(void) unsigned long max_pfn = xen_start_info->nr_pages; e820.nr_map = 0; +#ifdef CONFIG_X86_32 add_memory_region(0, LOWMEMSIZE(), E820_RAM); add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); +#else + add_memory_region(0, PFN_PHYS(max_pfn), E820_RAM); +#endif return "Xen"; } -- 1.5.4.1