Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

2014-06-05 12:35:52 +01:00
parent 20e7e36433 3f8517e793 8ef418c717 1c2f87c225
commit 1fb333489f
135 changed files with 2173 additions and 1546 deletions
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -132,6 +132,10 @@
 	orrne	r5, V7M_xPSR_FRAMEPTRALIGN
 	biceq	r5, V7M_xPSR_FRAMEPTRALIGN

+	@ ensure bit 0 is cleared in the PC, otherwise behaviour is
+	@ unpredictable
+	bic	r4, #1
+
 	@ write basic exception frame
 	stmdb	r2!, {r1, r3-r5}
 	ldmia	sp, {r1, r3-r5}