m68k: always make available dump_fpu() (8912eacc) · Commits · 戴 / test

Our local m68k architecture dump_fpu() is conditionally compiled in on CONFIG_FPU. That is OK for all existing MMU enabled CPU types, but won't handle the case for some ColdFire SoC CPU parts that we want to support that have no FPU hardware. dump_fpu() is expected to be present by the ELF loader, so we must always have it available and exported. Remove the conditional and reorganize the dump_fpu hard FPU code path to let the compiler remove code when not needed. This change based on changes and discussion from Yannick Gicquel <yannick.gicquel@open.eurogiciel.org>. Signed-off-by:

Greg Ungerer <gerg@linux-m68k.org>

arch/m68k/kernel/process.c

+28 −28

Original line number	Diff line number	Diff line
		@@ -203,11 +203,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
		}

		/* Fill in the fpu structure for a core dump. */
		#ifdef CONFIG_FPU
		int dump_fpu (struct pt_regs regs, struct user_m68kfp_struct fpu)
		{
		char fpustate[216];

		if (FPU_IS_EMU) {
		int i;

		@@ -222,6 +219,9 @@ int dump_fpu (struct pt_regs regs, struct user_m68kfp_struct fpu)
		return 1;
		}

		if (IS_ENABLED(CONFIG_FPU)) {
		char fpustate[216];

		/* First dump the fpu context to avoid protocol violation. */
		asm volatile ("fsave %0" :: "m" (fpustate[0]) : "memory");
		if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2])
		@@ -248,11 +248,11 @@ int dump_fpu (struct pt_regs regs, struct user_m68kfp_struct fpu)
		: "m" (fpu->fpregs[0])
		: "memory");
		}
		}

		return 1;
		}
		EXPORT_SYMBOL(dump_fpu);
		#endif /* CONFIG_FPU */

		unsigned long get_wchan(struct task_struct *p)
		{

Admin message