Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1129-2.6.25-xen-reserve_bootmem-xenstore-and-console-interfac.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 606 - (show annotations) (download)
Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
File size: 1051 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 From 76a697f840a60434ace25dc3fc67c54c040807a8 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Fri, 25 Jan 2008 11:16:57 -0200
4 Subject: [PATCH] Xen: reserve_bootmem() xenstore and console interface pages
5
6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
7 ---
8 arch/x86/kernel/setup_64.c | 8 ++++++++
9 1 files changed, 8 insertions(+), 0 deletions(-)
10
11 diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
12 index 479c782..e2ba835 100644
13 --- a/arch/x86/kernel/setup_64.c
14 +++ b/arch/x86/kernel/setup_64.c
15 @@ -424,6 +424,14 @@ void __init setup_arch(char **cmdline_p)
16 reserve_bootmem(__pa(xen_start_info),
17 sizeof(*xen_start_info),
18 BOOTMEM_DEFAULT);
19 +
20 + if (!is_initial_xendomain()) {
21 + /* Reserve the xenstore and console interface pages */
22 + reserve_bootmem(mfn_to_pfn(xen_start_info->store_mfn) << PAGE_SHIFT,
23 + PAGE_SIZE, BOOTMEM_DEFAULT);
24 + reserve_bootmem(mfn_to_pfn(xen_start_info->console.domU.mfn) << PAGE_SHIFT,
25 + PAGE_SIZE, BOOTMEM_DEFAULT);
26 + }
27 #endif
28
29 /*
30 --
31 1.5.4.1
32