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

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

diff --combined arch/arm/kernel/entry-header.S
index 7f4d80c2db6bf128451c8390b7f9048ca413034c,e056c9a9aa9db178ba47ec421f2e8d1f53d3cab4..0f07579af472c8ec869c5d87fd8d1e105a24dcba
--- 1/arch/arm/kernel/entry-header.S
--- 2/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@@ -1,4 -1,3 +1,4 @@@
 +/* SPDX-License-Identifier: GPL-2.0 */
  #include <linux/init.h>
  #include <linux/linkage.h>
  
@@@ -300,7 -299,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 -331,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