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/tlb.h

diff --cc arch/arm/Kconfig
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/mm/alignment.c
index cfbcf8b9559955a9919a5f7732afa826d516e28b,f0bf61ae95fc9edd82dc4681ea2fd326c4c8a3b1..2f1323525941d14cb42955e9aaab86c12748c2a7
--- 1/arch/arm/mm/alignment.c
--- 2/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@@ -965,10 -945,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");
  
        /*