Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1079-2.6.25-xen-Reserve-bootmem-areas-used-by-Xen-FIXME.patch

    Annotation of /trunk/kernel26-xen/patches-2.6.25-r1/1079-2.6.25-xen-Reserve-bootmem-areas-used-by-Xen-FIXME.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 606 - (hide annotations) (download)
    Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
    File size: 1484 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 c9468ba09817a627bf547f57973f7ba14eb2fb5d Mon Sep 17 00:00:00 2001
    2     From: Eduardo Habkost <ehabkost@redhat.com>
    3     Date: Thu, 20 Dec 2007 16:03:58 -0200
    4     Subject: [PATCH] Reserve bootmem areas used by Xen (FIXME)
    5    
    6     Should be moved to pvops code.
    7    
    8     Debugging needs to be removed.
    9    
    10     Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    11     ---
    12     arch/x86/kernel/setup_64.c | 22 ++++++++++++++++++++++
    13     1 files changed, 22 insertions(+), 0 deletions(-)
    14    
    15     diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
    16     index 5768ef5..5efffe8 100644
    17     --- a/arch/x86/kernel/setup_64.c
    18     +++ b/arch/x86/kernel/setup_64.c
    19     @@ -73,6 +73,12 @@
    20     #define ARCH_SETUP
    21     #endif
    22    
    23     +
    24     +/*FIXME: remove xen-specific code here */
    25     +#include <xen/page.h>
    26     +#include <asm/xen/hypervisor.h>
    27     +
    28     +
    29     /*
    30     * Machine setup..
    31     */
    32     @@ -399,6 +405,22 @@ void __init setup_arch(char **cmdline_p)
    33     if (efi_enabled)
    34     efi_reserve_bootmem();
    35    
    36     +#ifdef CONFIG_XEN
    37     + /*FIXME: pvops */
    38     + /* Reserve phys_to_machine_mapping */
    39     + reserve_bootmem(__pa(phys_to_machine_mapping),
    40     + sizeof(unsigned long *)*xen_start_info->nr_pages,
    41     + BOOTMEM_DEFAULT);
    42     +
    43     + /* Reserve initial pagetables*/
    44     + /*FIXME: probably they are not used anymore and may be made
    45     + * writeable again after the kernel page tables are set up.
    46     + */
    47     + reserve_bootmem(__pa(xen_start_info->pt_base),
    48     + xen_start_info->nr_pt_frames*PAGE_SIZE,
    49     + BOOTMEM_DEFAULT);
    50     +#endif
    51     +
    52     /*
    53     * Find and reserve possible boot-time SMP configuration:
    54     */
    55     --
    56     1.5.4.1
    57