Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
	arch/arm/include/asm/pgalloc.h
	arch/arm/include/asm/pgtable.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/include/asm/tlb.h
	arch/arm/mm/context.c
	arch/arm/mm/proc-v7.S

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/compressed/head.S
Simple merge

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

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

diff --cc arch/arm/include/asm/proc-fns.h
index 633d1cb84d87cbe356496b863e24f85a5f0402ea,b5db4f415efd9ba297a295f209efb42c51a17ca8..34e852c636e0b97ef24ba32bcb8e70e6a9ab8a61
--- 1/arch/arm/include/asm/proc-fns.h
--- 2/arch/arm/include/asm/proc-fns.h
+++ b/arch/arm/include/asm/proc-fns.h
@@@ -79,16 -83,24 +83,20 @@@ extern void cpu_proc_fin(void)
  extern int cpu_do_idle(void);
  extern void cpu_dcache_clean_area(void *, int);
  extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
+ #ifdef CONFIG_ARM_LPAE
+ extern void cpu_set_pte_ext(pte_t *ptep, pte_t pte);
+ #else
  extern void cpu_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext);
+ #endif
  extern void cpu_reset(unsigned long addr) __attribute__((noreturn));
  #else
 -#define cpu_proc_init()                       processor._proc_init()
 -#define cpu_proc_fin()                        processor._proc_fin()
 -#define cpu_reset(addr)                       processor.reset(addr)
 -#define cpu_do_idle()                 processor._do_idle()
 -#define cpu_dcache_clean_area(addr,sz)        processor.dcache_clean_area(addr,sz)
 -#ifdef CONFIG_ARM_LPAE
 -#define cpu_set_pte_ext(ptep,pte)     processor.set_pte_ext(ptep,pte)
 -#else
 -#define cpu_set_pte_ext(ptep,pte,ext) processor.set_pte_ext(ptep,pte,ext)
 -#endif
 -#define cpu_do_switch_mm(pgd,mm)      processor.switch_mm(pgd,mm)
 +#define cpu_proc_init                 processor._proc_init
 +#define cpu_proc_fin                  processor._proc_fin
 +#define cpu_reset                     processor.reset
 +#define cpu_do_idle                   processor._do_idle
 +#define cpu_dcache_clean_area         processor.dcache_clean_area
 +#define cpu_set_pte_ext                       processor.set_pte_ext
 +#define cpu_do_switch_mm              processor.switch_mm
  #endif
  
  extern void cpu_resume(void);

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

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

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

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

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

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

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm/mm/alignment.c
index cfbcf8b9559955a9919a5f7732afa826d516e28b,bc98a6ebe1bce5b6ab6c9806d1890763e1fea4ff..2f1323525941d14cb42955e9aaab86c12748c2a7
--- 1/arch/arm/mm/alignment.c
--- 2/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@@ -965,10 -942,10 +971,10 @@@ static int __init alignment_init(void
                cr_alignment &= ~CR_A;
                cr_no_alignment &= ~CR_A;
                set_cr(cr_alignment);
 -              ai_usermode = UM_FIXUP;
 +              ai_usermode = safe_usermode(ai_usermode, false);
        }
  
-       hook_fault_code(1, do_alignment, SIGBUS, BUS_ADRALN,
+       hook_fault_code(ALIGNMENT_FAULT, do_alignment, SIGBUS, BUS_ADRALN,
                        "alignment exception");
  
        /*

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

diff --cc arch/arm/mm/fault.c
Simple merge

diff --cc arch/arm/mm/mm.h
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

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

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