Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1139-2.6.25-xen-Restore-some-sanity-on-the-initial-pagetable-bootmem.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1139-2.6.25-xen-Restore-some-sanity-on-the-initial-pagetable-bootmem.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: 1968 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 8c531e953028f7afedf794b8c30a7876a8fee268 Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Fri, 29 Feb 2008 17:29:45 -0300
    4 Subject: [PATCH] Restore some sanity on the initial pagetable bootmem reservation
    5
    6 One less #ifdef! :)
    7
    8 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    9 ---
    10 arch/x86/mm/init_64.c | 8 +++-----
    11 arch/x86/xen/enlighten.c | 6 ------
    12 2 files changed, 3 insertions(+), 11 deletions(-)
    13
    14 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
    15 index e1a071f..e21c9a4 100644
    16 --- a/arch/x86/mm/init_64.c
    17 +++ b/arch/x86/mm/init_64.c
    18 @@ -831,11 +831,11 @@ static void __init find_early_table_space(unsigned long end)
    19 round_up(pmds * 8, PAGE_SIZE) +
    20 round_up(ptes * 8, PAGE_SIZE);
    21
    22 - /*FIXME: what does this do? */
    23 + table_start = xen_alloc_pfn;
    24 +
    25 xen_extend_init_mapping(tables);
    26
    27 - table_start = xen_alloc_pfn;
    28 - table_end = table_start + (tables>>PAGE_SHIFT);
    29 + table_end = xen_alloc_pfn + (tables>>PAGE_SHIFT);
    30
    31 printk("kernel direct mapping tables up to %lx @ %lx-%lx\n",
    32 end, table_start << PAGE_SHIFT,
    33 @@ -943,11 +943,9 @@ void __init_refok init_memory_mapping(unsigned long start, unsigned long end)
    34 * - If that works, we may remove lots of xen-specific
    35 * bootmem reservation
    36 */
    37 -#ifndef CONFIG_XEN
    38 if (!after_bootmem)
    39 reserve_early(table_start << PAGE_SHIFT,
    40 table_end << PAGE_SHIFT, "PGTABLE");
    41 -#endif
    42 }
    43
    44 #ifndef CONFIG_NUMA
    45 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
    46 index fc2f956..d51ea4c 100644
    47 --- a/arch/x86/xen/enlighten.c
    48 +++ b/arch/x86/xen/enlighten.c
    49 @@ -1016,12 +1016,6 @@ static __init void xen_pagetable_setup_done(pgd_t *base)
    50 pin_pagetable_pfn(level, PFN_DOWN(__pa(base)));
    51 }
    52 #endif
    53 -
    54 -#ifdef CONFIG_X86_64
    55 - reserve_bootmem(xen_start_pfn << PAGE_SHIFT,
    56 - (xen_alloc_pfn - xen_start_pfn) << PAGE_SHIFT,
    57 - BOOTMEM_DEFAULT);
    58 -#endif
    59 }
    60
    61 /* This is called once we have the cpu_possible_map */
    62 --
    63 1.5.4.1
    64