Merge tag 'v3.10.56' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 16:33:17 +0000 (17:33 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 16:33:17 +0000 (17:33 +0100)
This is the 3.10.56 stable release

1  2 
arch/arm/kernel/entry-common.S
arch/arm/mm/abort-ev6.S
arch/arm/mm/alignment.c
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
block/genhd.c
drivers/usb/host/ehci-hcd.c
include/linux/sched.h
include/linux/workqueue.h

index 8c79344552d5f22ff1a39d07074fa1188ec267ad,4bc816a74a2ee9e9e478165846f4b79680bb395c..11d68917d3b1ec23fd6f6156c2030f325b04d2b6
@@@ -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)
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc block/genhd.c
Simple merge
Simple merge
Simple merge
Simple merge