From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 18 Jun 2013 19:14:44 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: next-20130619~113^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e74d1d916e7fca94c31786c551539c99cdaa4e0;p=karo-tx-linux.git

Merge branch 'devel-stable' into for-next
---

7e74d1d916e7fca94c31786c551539c99cdaa4e0
diff --cc arch/arm/kernel/entry-common.S
index 4bc816a74a2e,85a72b0809ca..94104bf69719
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@@ -360,18 -363,9 +363,19 @@@ ENTRY(vector_swi
  	str	lr, [sp, #S_PC]			@ Save calling PC
  	str	r8, [sp, #S_PSR]		@ Save CPSR
  	str	r0, [sp, #S_OLD_R0]		@ Save OLD_R0
+ #endif
  	zero_fp
  
 +#ifdef CONFIG_ALIGNMENT_TRAP
 +	ldr	ip, __cr_alignment
 +	ldr	ip, [ip]
 +	mcr	p15, 0, ip, c1, c0		@ update control register
 +#endif
 +
 +	enable_irq
 +	ct_user_exit
 +	get_thread_info tsk
 +
  	/*
  	 * Get the system call number.
  	 */