Commit a96bfed6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fix from Russell King:

 - fix gcc 10 compiler regression with cpu_init()

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9081/1: fix gcc-10 thumb2-kernel regression
parents 13311e74 dad7b989

arch/arm/kernel/setup.c

+9 −7
Original line number Diff line number Diff line
@@ -545,9 +545,11 @@ void notrace cpu_init(void) 
	 * In Thumb-2, msr with an immediate value is not allowed.

	 */

#ifdef CONFIG_THUMB2_KERNEL

#define PLC	"r"

#define PLC_l	"l"

#define PLC_r	"r"

#else

#define PLC	"I"

#define PLC_l	"I"

#define PLC_r	"I"

#endif



	/*
@@ -569,15 +571,15 @@ void notrace cpu_init(void) 
	"msr	cpsr_c, %9"

	    :

	    : "r" (stk),

	      PLC (PSR_F_BIT | PSR_I_BIT | IRQ_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | IRQ_MODE),

	      "I" (offsetof(struct stack, irq[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | ABT_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | ABT_MODE),

	      "I" (offsetof(struct stack, abt[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | UND_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | UND_MODE),

	      "I" (offsetof(struct stack, und[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | FIQ_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | FIQ_MODE),

	      "I" (offsetof(struct stack, fiq[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | SVC_MODE)

	      PLC_l (PSR_F_BIT | PSR_I_BIT | SVC_MODE)

	    : "r14");

#endif

}