lkml.org 
[lkml]   [2012]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 06/46] x86, mm: Change find_early_table_space() paramters
    Date
    call split_mem_range inside the function, that will make us call
    split_mem_range two times. Following patch:

    x86, mm: Find early page table buffer together

    tidies this up so we do not end up calling split_mem_range twice.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    ---
    arch/x86/mm/init.c | 12 +++++++++---
    1 files changed, 9 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
    index dbef4ff..51f919f 100644
    --- a/arch/x86/mm/init.c
    +++ b/arch/x86/mm/init.c
    @@ -196,12 +196,18 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
    * mr[0].start to mr[nr_range - 1].end, while accounting for possible 2M and 1GB
    * pages. Then find enough contiguous space for those page tables.
    */
    -static void __init find_early_table_space(struct map_range *mr, int nr_range)
    +static void __init find_early_table_space(unsigned long start, unsigned long end)
    {
    int i;
    unsigned long puds = 0, pmds = 0, ptes = 0, tables;
    - unsigned long start = 0, good_end;
    + unsigned long good_end;
    phys_addr_t base;
    + struct map_range mr[NR_RANGE_MR];
    + int nr_range;
    +
    + memset(mr, 0, sizeof(mr));
    + nr_range = 0;
    + nr_range = split_mem_range(mr, nr_range, start, end);

    for (i = 0; i < nr_range; i++) {
    unsigned long range, extra;
    @@ -276,7 +282,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
    * nodes are discovered.
    */
    if (!after_bootmem)
    - find_early_table_space(mr, nr_range);
    + find_early_table_space(start, end);

    for (i = 0; i < nr_range; i++)
    ret = kernel_physical_mapping_init(mr[i].start, mr[i].end,
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-11-29 01:01    [W:4.413 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site