lkml.org 
[lkml]   [2008]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] x86: move reservetop and vmalloc parsing to pgtable_32.c
    Date

    also change reserve_top_address to __init attibute

    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

    ---
    arch/x86/kernel/setup_32.c | 33 ---------------------------------
    arch/x86/mm/pgtable_32.c | 35 ++++++++++++++++++++++++++++++++++-
    2 files changed, 34 insertions(+), 34 deletions(-)

    Index: linux-2.6/arch/x86/kernel/setup_32.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/setup_32.c
    +++ linux-2.6/arch/x86/kernel/setup_32.c
    @@ -185,39 +185,6 @@ static inline void copy_edd(void)
    }
    #endif

    -/*
    - * vmalloc=size forces the vmalloc area to be exactly 'size'
    - * bytes. This can be used to increase (or decrease) the
    - * vmalloc area - the default is 128m.
    - */
    -static int __init parse_vmalloc(char *arg)
    -{
    - if (!arg)
    - return -EINVAL;
    -
    - __VMALLOC_RESERVE = memparse(arg, &arg);
    - return 0;
    -}
    -early_param("vmalloc", parse_vmalloc);
    -
    -/*
    - * reservetop=size reserves a hole at the top of the kernel address space which
    - * a hypervisor can load into later. Needed for dynamically loaded hypervisors,
    - * so relocating the fixmap can be done before paging initialization.
    - */
    -static int __init parse_reservetop(char *arg)
    -{
    - unsigned long address;
    -
    - if (!arg)
    - return -EINVAL;
    -
    - address = memparse(arg, &arg);
    - reserve_top_address(address);
    - return 0;
    -}
    -early_param("reservetop", parse_reservetop);
    -
    #ifdef CONFIG_BLK_DEV_INITRD

    static bool do_relocate_initrd = false;
    Index: linux-2.6/arch/x86/mm/pgtable_32.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/mm/pgtable_32.c
    +++ linux-2.6/arch/x86/mm/pgtable_32.c
    @@ -152,7 +152,7 @@ EXPORT_SYMBOL(__FIXADDR_TOP);
    * Can be used to relocate the fixmap area and poke a hole in the top
    * of kernel address space to make room for a hypervisor.
    */
    -void reserve_top_address(unsigned long reserve)
    +void __init reserve_top_address(unsigned long reserve)
    {
    BUG_ON(fixmaps_set > 0);
    printk(KERN_INFO "Reserving virtual address space above 0x%08x\n",
    @@ -160,3 +160,36 @@ void reserve_top_address(unsigned long r
    __FIXADDR_TOP = -reserve - PAGE_SIZE;
    __VMALLOC_RESERVE += reserve;
    }
    +
    +/*
    + * vmalloc=size forces the vmalloc area to be exactly 'size'
    + * bytes. This can be used to increase (or decrease) the
    + * vmalloc area - the default is 128m.
    + */
    +static int __init parse_vmalloc(char *arg)
    +{
    + if (!arg)
    + return -EINVAL;
    +
    + __VMALLOC_RESERVE = memparse(arg, &arg);
    + return 0;
    +}
    +early_param("vmalloc", parse_vmalloc);
    +
    +/*
    + * reservetop=size reserves a hole at the top of the kernel address space which
    + * a hypervisor can load into later. Needed for dynamically loaded hypervisors,
    + * so relocating the fixmap can be done before paging initialization.
    + */
    +static int __init parse_reservetop(char *arg)
    +{
    + unsigned long address;
    +
    + if (!arg)
    + return -EINVAL;
    +
    + address = memparse(arg, &arg);
    + reserve_top_address(address);
    + return 0;
    +}
    +early_param("reservetop", parse_reservetop);

    \
     
     \ /
      Last update: 2008-06-23 02:43    [W:0.026 / U:0.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site