lkml.org 
[lkml]   [2010]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 21/35] x86: move back find_e820_area to e820.c
    make early_res.c more clean, so later could move it to /kernel

    Signed-off: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/include/asm/e820.h | 2 +
    arch/x86/include/asm/early_res.h | 4 +-
    arch/x86/kernel/e820.c | 57 ++++++++++++++++++++++++++++++++++++++
    arch/x86/kernel/early_res.c | 56 -------------------------------------
    4 files changed, 61 insertions(+), 58 deletions(-)

    diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
    index efad699..a8299e1 100644
    --- a/arch/x86/include/asm/e820.h
    +++ b/arch/x86/include/asm/e820.h
    @@ -109,6 +109,8 @@ static inline void early_memtest(unsigned long start, unsigned long end)

    extern unsigned long end_user_pfn;

    +extern u64 find_e820_area(u64 start, u64 end, u64 size, u64 align);
    +extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align);
    extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);
    #include <asm/early_res.h>

    diff --git a/arch/x86/include/asm/early_res.h b/arch/x86/include/asm/early_res.h
    index 2d43b16..5a4d2eb 100644
    --- a/arch/x86/include/asm/early_res.h
    +++ b/arch/x86/include/asm/early_res.h
    @@ -2,8 +2,6 @@
    #define _ASM_X86_EARLY_RES_H
    #ifdef __KERNEL__

    -extern u64 find_e820_area(u64 start, u64 end, u64 size, u64 align);
    -extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align);
    extern void reserve_early(u64 start, u64 end, char *name);
    extern void reserve_early_overlap_ok(u64 start, u64 end, char *name);
    extern void free_early(u64 start, u64 end);
    @@ -12,6 +10,8 @@ extern void early_res_to_bootmem(u64 start, u64 end);
    void reserve_early_without_check(u64 start, u64 end, char *name);
    u64 find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
    u64 size, u64 align);
    +u64 find_early_area_size(u64 ei_start, u64 ei_last, u64 start,
    + u64 *sizep, u64 align);
    #include <linux/range.h>
    int get_free_all_memory_range(struct range **rangep, int nodeid);

    diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
    index 096bb31..86cbbd0 100644
    --- a/arch/x86/kernel/e820.c
    +++ b/arch/x86/kernel/e820.c
    @@ -723,6 +723,63 @@ core_initcall(e820_mark_nvs_memory);
    #endif

    /*
    + * Find a free area with specified alignment in a specific range.
    + */
    +u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align)
    +{
    + int i;
    +
    + for (i = 0; i < e820.nr_map; i++) {
    + struct e820entry *ei = &e820.map[i];
    + u64 addr;
    + u64 ei_start, ei_last;
    +
    + if (ei->type != E820_RAM)
    + continue;
    +
    + ei_last = ei->addr + ei->size;
    + ei_start = ei->addr;
    + addr = find_early_area(ei_start, ei_last, start, end,
    + size, align);
    +
    + if (addr == -1ULL)
    + continue;
    +
    + return addr;
    + }
    + return -1ULL;
    +}
    +
    +/*
    + * Find next free range after *start
    + */
    +u64 __init find_e820_area_size(u64 start, u64 *sizep, u64 align)
    +{
    + int i;
    +
    + for (i = 0; i < e820.nr_map; i++) {
    + struct e820entry *ei = &e820.map[i];
    + u64 addr;
    + u64 ei_start, ei_last;
    +
    + if (ei->type != E820_RAM)
    + continue;
    +
    + ei_last = ei->addr + ei->size;
    + ei_start = ei->addr;
    + addr = find_early_area_size(ei_start, ei_last, start,
    + sizep, align);
    +
    + if (addr == -1ULL)
    + continue;
    +
    + return addr;
    + }
    +
    + return -1ULL;
    +}
    +
    +/*
    * pre allocated 4k and reserved it in e820
    */
    u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align)
    diff --git a/arch/x86/kernel/early_res.c b/arch/x86/kernel/early_res.c
    index aba02f2..d0a70cc 100644
    --- a/arch/x86/kernel/early_res.c
    +++ b/arch/x86/kernel/early_res.c
    @@ -499,60 +499,4 @@ out:
    return -1ULL;
    }

    -/*
    - * Find a free area with specified alignment in a specific range.
    - */
    -u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align)
    -{
    - int i;
    -
    - for (i = 0; i < e820.nr_map; i++) {
    - struct e820entry *ei = &e820.map[i];
    - u64 addr;
    - u64 ei_start, ei_last;
    -
    - if (ei->type != E820_RAM)
    - continue;
    -
    - ei_last = ei->addr + ei->size;
    - ei_start = ei->addr;
    - addr = find_early_area(ei_start, ei_last, start, end,
    - size, align);
    -
    - if (addr == -1ULL)
    - continue;
    -
    - return addr;
    - }
    - return -1ULL;
    -}
    -
    -/*
    - * Find next free range after *start
    - */
    -u64 __init find_e820_area_size(u64 start, u64 *sizep, u64 align)
    -{
    - int i;
    -
    - for (i = 0; i < e820.nr_map; i++) {
    - struct e820entry *ei = &e820.map[i];
    - u64 addr;
    - u64 ei_start, ei_last;
    -
    - if (ei->type != E820_RAM)
    - continue;
    -
    - ei_last = ei->addr + ei->size;
    - ei_start = ei->addr;
    - addr = find_early_area_size(ei_start, ei_last, start,
    - sizep, align);
    -
    - if (addr == -1ULL)
    - continue;
    -
    - return addr;
    - }
    -
    - return -1ULL;
    -}

    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-02-09 20:43    [W:0.030 / U:0.860 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site