From 88bf597f098be45ebd77ed410a8a5f4392f844fb Mon Sep 17 00:00:00 2001 From: XiaoDong Huang Date: Tue, 9 Jan 2024 14:50:27 +0800 Subject: [PATCH] ARM: fiq_glue: save/restore r6 in fiq_glue_setup Fixes: fce07a27c8e4 ("ARM: fiq_glue: fix compilation error for THUMB2_KERNEL") Signed-off-by: XiaoDong Huang Change-Id: I89c8d3d8f9665d18917b0be5be4a5fd33bf21408 --- arch/arm/common/fiq_glue.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/common/fiq_glue.S b/arch/arm/common/fiq_glue.S index 9881d2dc3364..57e6be8bfcfd 100644 --- a/arch/arm/common/fiq_glue.S +++ b/arch/arm/common/fiq_glue.S @@ -117,6 +117,7 @@ fiq_glue_end: ENTRY(fiq_glue_setup) /* func, data, sp, smc call number */ stmfd sp!, {r4} + THUMB( stmfd sp!, {r6} ) mrs r4, cpsr THUMB( mov r6, #(FIQ_MODE | PSR_I_BIT | PSR_F_BIT) ) THUMB( msr cpsr_c, r6 ) @@ -128,6 +129,7 @@ ENTRY(fiq_glue_setup) /* func, data, sp, smc call number */ moveq r10, #0 movne r10, #1 msr cpsr_c, r4 + THUMB( ldmfd sp!, {r6} ) ldmfd sp!, {r4} bx lr