m68k: make fp register stores consistent for m68k and ColdFire

There is no reason we can't make the saved fp registers the same for all
m68k types and ColdFire. There is a little wasted space, but the code
consistency and cleanliness is a big win.

sigcontext.h is an exported header, but currently there is no in-mainline
users of the !__uClinux__ and __mcoldfire__ case that this change effects.
Even better this change actually makes this structure consistent with
the out-of-mainline ColdFire/MMU code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h
index a29dd74a17cb25827a203654c5d7fafb156ff485..523db2a51cf304137b52315cae08ee2e4a7c8144 100644 (file)
--- a/arch/m68k/include/asm/sigcontext.h
+++ b/arch/m68k/include/asm/sigcontext.h
@@ -15,11 +15,7 @@ struct sigcontext {
        unsigned long  sc_pc;
        unsigned short sc_formatvec;
 #ifndef __uClinux__
-# ifdef __mcoldfire__
-       unsigned long  sc_fpregs[2][2]; /* room for two fp registers */
-# else
        unsigned long  sc_fpregs[2*3];  /* room for two fp registers */
-# endif
        unsigned long  sc_fpcntl[3];
        unsigned char  sc_fpstate[216];
 #endif

diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h
index 00dcc5176c577ba82d505b297f1447981fc7dac4..e4e22669edc0669c55c1edc9a1947664b3c1d4bc 100644 (file)
--- a/arch/m68k/include/asm/ucontext.h
+++ b/arch/m68k/include/asm/ucontext.h
@@ -7,11 +7,7 @@ typedef greg_t gregset_t[NGREG];
 
 typedef struct fpregset {
        int f_fpcntl[3];
-#ifdef __mcoldfire__
-       int f_fpregs[8][2];
-#else
        int f_fpregs[8*3];
-#endif
 } fpregset_t;
 
 struct mcontext {