diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-10-05 23:16:06 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-05 23:16:06 -0400 |
| commit | b6c8cfdbc5d5dcaea664ffea9c300c6e5d70ab09 (patch) | |
| tree | 14200faac151c696751180742eae30b15385012d /arch/arm/mm/mmu.c | |
| parent | 78475c9d785a6d7b3d110e8ebcc9a4d6f1ff473b (diff) | |
| parent | 1c7eb28096b50831697a9cf6f8bf1af0e5b234bc (diff) | |
Merge tag 'v3.4.12' into v3.4-rt
This is the 3.4.12 stable release
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 75f9f9d67097..7d419193d49a 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -805,7 +805,7 @@ static void __init pmd_empty_section_gap(unsigned long addr) vm = early_alloc_aligned(sizeof(*vm), __alignof__(*vm)); vm->addr = (void *)addr; vm->size = SECTION_SIZE; - vm->flags = VM_IOREMAP | VM_ARM_STATIC_MAPPING; + vm->flags = VM_IOREMAP | VM_ARM_EMPTY_MAPPING; vm->caller = pmd_empty_section_gap; vm_area_add_early(vm); } @@ -818,7 +818,7 @@ static void __init fill_pmd_gaps(void) /* we're still single threaded hence no lock needed here */ for (vm = vmlist; vm; vm = vm->next) { - if (!(vm->flags & VM_ARM_STATIC_MAPPING)) + if (!(vm->flags & (VM_ARM_STATIC_MAPPING | VM_ARM_EMPTY_MAPPING))) continue; addr = (unsigned long)vm->addr; if (addr < next) |