lkml.org 
[lkml]   [2012]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 17/22] ARM: mm: clean up membank size limit checks
    Date
    This patch cleans up the highmem sanity check code by simplifying the range
    checks with a pre-calculated size_limit. This patch should otherwise have no
    functional impact on behavior.

    This patch also removes a redundant (bank->start < vmalloc_limit) check, since
    this is already covered by the !highmem condition.

    Signed-off-by: Cyril Chemparathy <cyril@ti.com>
    Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
    ---
    arch/arm/mm/mmu.c | 19 +++++++++++--------
    1 file changed, 11 insertions(+), 8 deletions(-)

    diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
    index 3d685c6..662684b 100644
    --- a/arch/arm/mm/mmu.c
    +++ b/arch/arm/mm/mmu.c
    @@ -899,10 +899,15 @@ void __init sanity_check_meminfo(void)

    for (i = 0, j = 0; i < meminfo.nr_banks; i++) {
    struct membank *bank = &meminfo.bank[j];
    + phys_addr_t size_limit;
    +
    *bank = meminfo.bank[i];
    + size_limit = bank->size;

    if (bank->start >= vmalloc_limit)
    highmem = 1;
    + else
    + size_limit = vmalloc_limit - bank->start;

    bank->highmem = highmem;

    @@ -911,8 +916,7 @@ void __init sanity_check_meminfo(void)
    * Split those memory banks which are partially overlapping
    * the vmalloc area greatly simplifying things later.
    */
    - if (!highmem && bank->start < vmalloc_limit &&
    - bank->size > vmalloc_limit - bank->start) {
    + if (!highmem && bank->size > size_limit) {
    if (meminfo.nr_banks >= NR_BANKS) {
    printk(KERN_CRIT "NR_BANKS too low, "
    "ignoring high memory\n");
    @@ -921,12 +925,12 @@ void __init sanity_check_meminfo(void)
    (meminfo.nr_banks - i) * sizeof(*bank));
    meminfo.nr_banks++;
    i++;
    - bank[1].size -= vmalloc_limit - bank->start;
    + bank[1].size -= size_limit;
    bank[1].start = vmalloc_limit;
    bank[1].highmem = highmem = 1;
    j++;
    }
    - bank->size = vmalloc_limit - bank->start;
    + bank->size = size_limit;
    }
    #else
    /*
    @@ -944,14 +948,13 @@ void __init sanity_check_meminfo(void)
    * Check whether this memory bank would partially overlap
    * the vmalloc area.
    */
    - if (bank->start + bank->size > vmalloc_limit)
    - unsigned long newsize = vmalloc_limit - bank->start;
    + if (bank->size > size_limit) {
    printk(KERN_NOTICE "Truncating RAM at %.8llx-%.8llx "
    "to -%.8llx (vmalloc region overlap).\n",
    (unsigned long long)bank->start,
    (unsigned long long)bank->start + bank->size - 1,
    - (unsigned long long)bank->start + newsize - 1);
    - bank->size = newsize;
    + (unsigned long long)bank->start + size_limit - 1);
    + bank->size = size_limit;
    }
    #endif
    if (!bank->highmem && bank->start + bank->size > arm_lowmem_limit)
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-08-11 04:02    [W:4.962 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site