/[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1028-2.6.25-xen-x86_64-Remove-the-640K-1M-hole-and-disable-DMI.patch |
Annotation of /trunk/kernel26-xen/patches-2.6.25-r1/1028-2.6.25-xen-x86_64-Remove-the-640K-1M-hole-and-disable-DMI.patch
Parent Directory | Revision Log
Revision 606 -
(hide annotations)
(download)
Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
File size: 1529 byte(s)
Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
File size: 1529 byte(s)
-ver bump to 2.6.25-magellan-r1: - linux-2.6.25.4 - fbcondecor-0.9.4 - squashfs-3.3 - unionfs-2.3.3 - tuxonice-3.0-rc7 - linux-phc-0.3.0 - acpi-dstd-0.9a - reiser4 - xen-3.2.0 . ipw3945-1.2.2
1 | niro | 606 | From 91304aa707ef68c92bb9ae3651b1b7e9808caab7 Mon Sep 17 00:00:00 2001 |
2 | From: Eduardo Habkost <ehabkost@redhat.com> | ||
3 | Date: Wed, 5 Mar 2008 11:48:34 -0300 | ||
4 | Subject: [PATCH] xen x86_64: Remove the 640K-1M hole and disable DMI (TEMPORARY) | ||
5 | |||
6 | On 64-bit, we don't have the LOWMEM and HIGHMEM macros. As I think | ||
7 | using the LOWMEM and HIGHMEM macros on 64-bit would be ugly, I am | ||
8 | disabling the hole temporarily, until I understand the DMI problem | ||
9 | properly. | ||
10 | |||
11 | Instead, for now, just disable CONFIG_DMI under CONFIG_XEN. | ||
12 | |||
13 | Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> | ||
14 | Signed-off-by: Mark McLoughlin <markmc@redhat.com> | ||
15 | --- | ||
16 | arch/x86/Kconfig | 2 +- | ||
17 | arch/x86/xen/setup.c | 4 ++++ | ||
18 | 2 files changed, 5 insertions(+), 1 deletions(-) | ||
19 | |||
20 | diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig | ||
21 | index 6c70fed..3daae55 100644 | ||
22 | --- a/arch/x86/Kconfig | ||
23 | +++ b/arch/x86/Kconfig | ||
24 | @@ -89,7 +89,7 @@ config ARCH_MAY_HAVE_PC_FDC | ||
25 | def_bool y | ||
26 | |||
27 | config DMI | ||
28 | - def_bool y | ||
29 | + def_bool !XEN | ||
30 | |||
31 | config RWSEM_GENERIC_SPINLOCK | ||
32 | def_bool !X86_XADD | ||
33 | diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c | ||
34 | index 2341492..d42586d 100644 | ||
35 | --- a/arch/x86/xen/setup.c | ||
36 | +++ b/arch/x86/xen/setup.c | ||
37 | @@ -38,8 +38,12 @@ char * __init xen_memory_setup(void) | ||
38 | unsigned long max_pfn = xen_start_info->nr_pages; | ||
39 | |||
40 | e820.nr_map = 0; | ||
41 | +#ifdef CONFIG_X86_32 | ||
42 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); | ||
43 | add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); | ||
44 | +#else | ||
45 | + add_memory_region(0, PFN_PHYS(max_pfn), E820_RAM); | ||
46 | +#endif | ||
47 | |||
48 | return "Xen"; | ||
49 | } | ||
50 | -- | ||
51 | 1.5.4.1 | ||
52 |