Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
	arch/arm64/kernel/head.S

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

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

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

diff --cc arch/arm64/kernel/vdso.c
Simple merge

diff --cc arch/arm64/mm/mmu.c
index 28e56293ad4f4ee2f648267177f89163519031ff,639dca61ad7a31fb770de6fc2f295b797909fe5a..a2155ca6921c5819dadbfab0db2285e3cb214616
--- 1/arch/arm64/mm/mmu.c
--- 2/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@@ -158,6 -160,17 +160,17 @@@ static void __init alloc_init_pmd(pud_
  {
        pmd_t *pmd;
        unsigned long next;
 -              prot_sect = prot_sect_kernel;
+       pmdval_t prot_sect;
+       pgprot_t prot_pte;
+ 
+       if (map_io) {
+               prot_sect = PMD_TYPE_SECT | PMD_SECT_AF |
+                           PMD_ATTRINDX(MT_DEVICE_nGnRE);
+               prot_pte = __pgprot(PROT_DEVICE_nGnRE);
+       } else {
++              prot_sect = PROT_SECT_NORMAL_EXEC;
+               prot_pte = PAGE_KERNEL_EXEC;
+       }
  
        /*
         * Check for initial section mappings in the pgd/pud and remove them.