From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Aug 2011 23:33:19 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-lpae/for-next'
X-Git-Tag: next-20110810~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=134122145570f8716d5ff785d2486c96724ad9c3;p=karo-tx-linux.git

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
---

134122145570f8716d5ff785d2486c96724ad9c3
diff --cc arch/arm/mm/alignment.c
index cfbcf8b95599,f0bf61ae95fc..2f1323525941
--- a/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");
  
  	/*