Automatic merge of 'next' into merge (2023-10-16 11:50)

linuxppc · Oct 16, 2023 · dbcb0dd · dbcb0dd
2 parents 2d6014c + c7e0d9b
commit dbcb0dd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
@@ -1164,6 +1164,7 @@ void emulate_single_step(struct pt_regs *regs)
 		__single_step_exception(regs);
 }
 
+#ifdef CONFIG_PPC_FPU_REGS
 static inline int __parse_fpscr(unsigned long fpscr)
 {
 	int ret = FPE_FLTUNK;
@@ -1190,6 +1191,7 @@ static inline int __parse_fpscr(unsigned long fpscr)
 
 	return ret;
 }
+#endif
 
 static void parse_fpe(struct pt_regs *regs)
 {