/[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1082-2.6.25-xen-ifdef-CONFIG_X86_32-on-xen-enlighten.c-REVIEWME.patch |
Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1082-2.6.25-xen-ifdef-CONFIG_X86_32-on-xen-enlighten.c-REVIEWME.patch
Parent Directory | Revision Log
Revision 606 -
(show annotations)
(download)
Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
File size: 1890 byte(s)
Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
File size: 1890 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 259034f8ec6e6d1de411d7ea60a7819eaa479308 Mon Sep 17 00:00:00 2001 |
2 | From: Eduardo Habkost <ehabkost@redhat.com> |
3 | Date: Wed, 23 Jan 2008 13:34:59 -0200 |
4 | Subject: [PATCH] ifdef CONFIG_X86_32 on xen/enlighten.c (REVIEWME) |
5 | |
6 | Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> |
7 | --- |
8 | arch/x86/xen/enlighten.c | 11 +++++++++++ |
9 | 1 files changed, 11 insertions(+), 0 deletions(-) |
10 | |
11 | diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c |
12 | index fea52b0..fcf0554 100644 |
13 | --- a/arch/x86/xen/enlighten.c |
14 | +++ b/arch/x86/xen/enlighten.c |
15 | @@ -839,12 +839,18 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) |
16 | |
17 | static __init void xen_pagetable_setup_start(pgd_t *base) |
18 | { |
19 | +#ifdef CONFIG_X86_32 |
20 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; |
21 | +#endif |
22 | |
23 | /* special set_pte for pagetable initialization */ |
24 | pv_mmu_ops.set_pte = xen_set_pte_init; |
25 | |
26 | init_mm.pgd = base; |
27 | + |
28 | +#ifdef CONFIG_X86_32 |
29 | + /*FIXME: for x86_64, pull the mm/init_64.c code here */ |
30 | + |
31 | /* |
32 | * copy top-level of Xen-supplied pagetable into place. For |
33 | * !PAE we can use this as-is, but for PAE it is a stand-in |
34 | @@ -883,6 +889,7 @@ static __init void xen_pagetable_setup_start(pgd_t *base) |
35 | * added to the table can be prepared properly for Xen. |
36 | */ |
37 | xen_write_cr3(__pa(base)); |
38 | +#endif |
39 | |
40 | /* Unpin initial Xen pagetable */ |
41 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, |
42 | @@ -926,6 +933,9 @@ static __init void xen_pagetable_setup_done(pgd_t *base) |
43 | |
44 | setup_shared_info(); |
45 | |
46 | +#ifdef CONFIG_X86_32 |
47 | + /*FIXME: for x86_64, code needs to be pulled from mm/init_64.c */ |
48 | + |
49 | /* Actually pin the pagetable down, but we can't set PG_pinned |
50 | yet because the page structures don't exist yet. */ |
51 | { |
52 | @@ -939,6 +949,7 @@ static __init void xen_pagetable_setup_done(pgd_t *base) |
53 | |
54 | pin_pagetable_pfn(level, PFN_DOWN(__pa(base))); |
55 | } |
56 | +#endif |
57 | } |
58 | |
59 | /* This is called once we have the cpu_possible_map */ |
60 | -- |
61 | 1.5.4.1 |
62 |