lkml.org 
[lkml]   [2011]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 17/19] ARM: LPAE: mark memory banks with start > ULONG_MAX as highmem
    Date
    From: Will Deacon <will.deacon@arm.com>

    Memory banks living outside of the 32-bit physical address
    space do not have a 1:1 pa <-> va mapping and therefore the
    __va macro may wrap.

    This patch ensures that such banks are marked as highmem so
    that the Kernel doesn't try to split them up when it sees that
    the wrapped virtual address overlaps the vmalloc space.

    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    ---
    arch/arm/mm/mmu.c | 5 +++--
    1 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
    index 6794c92..ec80ca1 100644
    --- a/arch/arm/mm/mmu.c
    +++ b/arch/arm/mm/mmu.c
    @@ -795,7 +795,8 @@ static void __init sanity_check_meminfo(void)
    *bank = meminfo.bank[i];

    #ifdef CONFIG_HIGHMEM
    - if (__va(bank->start) > vmalloc_min ||
    + if (bank->start > ULONG_MAX ||
    + __va(bank->start) > vmalloc_min ||
    __va(bank->start) < (void *)PAGE_OFFSET)
    highmem = 1;

    @@ -805,7 +806,7 @@ static void __init sanity_check_meminfo(void)
    * Split those memory banks which are partially overlapping
    * the vmalloc area greatly simplifying things later.
    */
    - if (__va(bank->start) < vmalloc_min &&
    + if (!highmem && __va(bank->start) < vmalloc_min &&
    bank->size > vmalloc_min - __va(bank->start)) {
    if (meminfo.nr_banks >= NR_BANKS) {
    printk(KERN_CRIT "NR_BANKS too low, "


    \
     
     \ /
      Last update: 2011-05-08 14:55    [W:0.022 / U:123.548 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site