lkml.org 
[lkml]   [2012]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 41/46] x86, mm: Use clamp_t() in init_range_memory_mapping
    Date
    save some lines, and make code more readable.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/mm/init.c | 21 +++++----------------
    1 files changed, 5 insertions(+), 16 deletions(-)

    diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
    index 2a27e5a..6f85de8 100644
    --- a/arch/x86/mm/init.c
    +++ b/arch/x86/mm/init.c
    @@ -357,31 +357,20 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
    * would have hole in the middle or ends, and only ram parts will be mapped.
    */
    static unsigned long __init init_range_memory_mapping(
    - unsigned long range_start,
    - unsigned long range_end)
    + unsigned long r_start,
    + unsigned long r_end)
    {
    unsigned long start_pfn, end_pfn;
    unsigned long mapped_ram_size = 0;
    int i;

    for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
    - u64 start = (u64)start_pfn << PAGE_SHIFT;
    - u64 end = (u64)end_pfn << PAGE_SHIFT;
    -
    - if (end <= range_start)
    - continue;
    -
    - if (start < range_start)
    - start = range_start;
    -
    - if (start >= range_end)
    + u64 start = clamp_val(PFN_PHYS(start_pfn), r_start, r_end);
    + u64 end = clamp_val(PFN_PHYS(end_pfn), r_start, r_end);
    + if (start >= end)
    continue;

    - if (end > range_end)
    - end = range_end;
    -
    init_memory_mapping(start, end);
    -
    mapped_ram_size += end - start;
    }

    --
    1.7.7


    \
     
     \ /
      Last update: 2012-11-17 05:21    [W:2.044 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site