From: Mark Brown <broonie@kernel.org>
Date: Mon, 6 Oct 2014 16:33:17 +0000 (+0100)
Subject: Merge tag 'v3.10.56' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ee8bb9c4864ee826e6c669f230562cd0fed8722;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.10.56' into linux-linaro-lsk

This is the 3.10.56 stable release
---

0ee8bb9c4864ee826e6c669f230562cd0fed8722
diff --cc arch/arm/kernel/entry-common.S
index 8c79344552d5,4bc816a74a2e..11d68917d3b1
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@@ -375,11 -385,13 +385,11 @@@ ENTRY(vector_swi
  #ifdef CONFIG_ARM_THUMB
  	tst	r8, #PSR_T_BIT
  	movne	r10, #0				@ no thumb OABI emulation
- 	ldreq	r10, [lr, #-4]			@ get SWI instruction
+  USER(	ldreq	r10, [lr, #-4]		)	@ get SWI instruction
  #else
- 	ldr	r10, [lr, #-4]			@ get SWI instruction
+  USER(	ldr	r10, [lr, #-4]		)	@ get SWI instruction
  #endif
 -#ifdef CONFIG_CPU_ENDIAN_BE8
 -	rev	r10, r10			@ little endian instruction
 -#endif
 + ARM_BE8(rev	r10, r10)			@ little endian instruction
  
  #elif defined(CONFIG_AEABI)