projects/linux·commit 87fc5c68

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

87fc5c68 · Linus Torvalds <[email protected]> · 2017-12-03 10:51:08 -05:00

Pull ARM fix from Russell King:
 "Just one fix this time around, for the late commit in the merge window
  that triggered a problem with qemu. Qemu is apparently also going to
  receive a fix for the discovered issue"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: avoid faulting on qemu
Commit
87fc5c686ef3db9e58d2fd65e1bcc368ee6b1b76
Parents
ae4806a3 · 3aaf33be

Merge commit. Changes below are compared with the first parent: ae4806a3.

Changes

1 files changed · +2 −2

FileStatusAddDelContent
arch/arm/kernel/entry-header.Smodified+2−2View file

arch/arm/kernel/entry-header.S

View file
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 7f4d80c..0f07579 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -300,7 +300,7 @@
mov r2, sp
ldr r1, [r2, #\offset + S_PSR] @ get calling cpsr
ldr lr, [r2, #\offset + S_PC]! @ get pc
- tst r1, #0xcf
+ tst r1, #PSR_I_BIT | 0x0f
bne 1f
msr spsr_cxsf, r1 @ save in spsr_svc
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
@@ -332,7 +332,7 @@
ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr
ldr lr, [sp, #\offset + S_PC] @ get pc
add sp, sp, #\offset + S_SP
- tst r1, #0xcf
+ tst r1, #PSR_I_BIT | 0x0f
bne 1f
msr spsr_cxsf, r1 @ save in spsr_svc