m68k: always make available dump_fpu()
PATCH v2 6/8 m68k: always make available dump_fpu()
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 <[email protected]>.
Signed-off-by Greg Ungerer <[email protected]>
--- arch/m68k/kernel/process.c | 56 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
v2: Modify to avoid warnings about unused fpustate in some configurations
arch/m68k/kernel/process.c +28 -28
@@ -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,37 +219,40 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu)return 1 ; } -/* First dump the fpu context to avoid protocol violation. */ - asmvolatile ("fsave %0" ::"m" (fpustate[0 ]) :"memory" ); -if (!CPU_IS_060 ? !fpustate[0 ] : !fpustate[2 ]) -return 0 ; +if (IS_ENABLED (CONFIG_FPU )) { +char fpustate[216 ]; -if (CPU_IS_COLDFIRE ) { - asmvolatile ("fmovel %/fpiar,%0\n\t" -"fmovel %/fpcr,%1\n\t" -"fmovel %/fpsr,%2\n\t" -"fmovemd %/fp0-%/fp7,%3" - : - :"m" (fpu->fpcntl[0 ]), -"m" (fpu->fpcntl[1 ]), -"m" (fpu->fpcntl[2 ]), -"m" (fpu->fpregs[0 ]) - :"memory" ); - }else { - asmvolatile ("fmovem %/fpiar/%/fpcr/%/fpsr,%0" - : - :"m" (fpu->fpcntl[0 ]) - :"memory" ); - asmvolatile ("fmovemx %/fp0-%/fp7,%0" - : - :"m" (fpu->fpregs[0 ]) - :"memory" ); +/* First dump the fpu context to avoid protocol violation. */ + asmvolatile ("fsave %0" ::"m" (fpustate[0 ]) :"memory" ); +if (!CPU_IS_060 ? !fpustate[0 ] : !fpustate[2 ]) +return 0 ; + +if (CPU_IS_COLDFIRE ) { + asmvolatile ("fmovel %/fpiar,%0\n\t" +"fmovel %/fpcr,%1\n\t" +"fmovel %/fpsr,%2\n\t" +"fmovemd %/fp0-%/fp7,%3" + : + :"m" (fpu->fpcntl[0 ]), +"m" (fpu->fpcntl[1 ]), +"m" (fpu->fpcntl[2 ]), +"m" (fpu->fpregs[0 ]) + :"memory" ); + }else { + asmvolatile ("fmovem %/fpiar/%/fpcr/%/fpsr,%0" + : + :"m" (fpu->fpcntl[0 ]) + :"memory" ); + asmvolatile ("fmovemx %/fp0-%/fp7,%0" + : + :"m" (fpu->fpregs[0 ]) + :"memory" ); + } }return 1 ; }EXPORT_SYMBOL (dump_fpu); -#endif /* CONFIG_FPU */ unsigned long get_wchan (struct task_struct *p) {
Signature · 1 line
1.9.1