Merge commit 'e26a9e0' into stable/for-linus-3.15

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/mmu.c
index a623cb3,6ec07a8..b68c6b2
--- 1/arch/arm/mm/mmu.c
--- 2/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -512,9 -508,18 +512,19 @@@ static void __init build_mem_type_table
        cp = &cache_policies[cachepolicy];
        vecs_pgprot = kern_pgprot = user_pgprot = cp->pte;
        s2_pgprot = cp->pte_s2;
 -      hyp_device_pgprot = s2_device_pgprot = mem_types[MT_DEVICE].prot_pte;
 +      hyp_device_pgprot = mem_types[MT_DEVICE].prot_pte;
 +      s2_device_pgprot = mem_types[MT_DEVICE].prot_pte_s2;
  
+       /*
+        * We don't use domains on ARMv6 (since this causes problems with
+        * v6/v7 kernels), so we must use a separate memory type for user
+        * r/o, kernel r/w to map the vectors page.
+        */
+ #ifndef CONFIG_ARM_LPAE
+       if (cpu_arch == CPU_ARCH_ARMv6)
+               vecs_pgprot |= L_PTE_MT_VECTORS;
+ #endif
+ 
        /*
         * ARMv6 and above have extended page tables.
         */

diff --cc arch/arm/mm/proc-v7.S
Simple merge

diff --cc drivers/clocksource/timer-u300.c
Simple merge