sh64: Fix up the build for the thread_xstate changes.

This updates the sh64 processor info with the sh32 changes in order to
tie in to the generic task_xstate management code.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 15 insertions, 13 deletions

diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h
index a522e5d8f44f..87a8d1ef64e4 100644
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@ -98,9 +98,15 @@ extern struct sh_cpuinfo cpu_data[];
 
 /* Forward decl */
 struct seq_operations;
+struct task_struct;
 
 extern struct pt_regs fake_swapper_regs;
 
+/* arch/sh/kernel/process.c */
+extern unsigned int xstate_size;
+extern void free_thread_xstate(struct task_struct *);
+extern struct kmem_cache *task_xstate_cachep;
+
 /* arch/sh/mm/init.c */
 extern unsigned int mem_init_done;
 
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h
index 5fd83125fb89..488f0a906a41 100644
--- a/arch/sh/include/asm/processor_32.h
+++ b/arch/sh/include/asm/processor_32.h
@@ -96,10 +96,6 @@ union thread_xstate {
         struct sh_fpu_soft_struct softfpu;
 };
 
-extern unsigned int xstate_size;
-extern void free_thread_xstate(struct task_struct *);
-extern struct kmem_cache *task_xstate_cachep;
-
 struct thread_struct {
         /* Saved registers when thread is descheduled */
         unsigned long sp;
diff --git a/arch/sh/include/asm/processor_64.h b/arch/sh/include/asm/processor_64.h
index 5727d31b0ccf..7b1560f03d14 100644
--- a/arch/sh/include/asm/processor_64.h
+++ b/arch/sh/include/asm/processor_64.h
@@ -87,20 +87,21 @@ struct sh_fpu_hard_struct {
         /* long status; * software status information */
 };
 
-#if 0
 /* Dummy fpu emulator  */
 struct sh_fpu_soft_struct {
-        unsigned long long fp_regs[32];
+        unsigned long fp_regs[64];
         unsigned int fpscr;
         unsigned char lookahead;
         unsigned long entry_pc;
 };
-#endif
 
-union sh_fpu_union {
-        struct sh_fpu_hard_struct hard;
-        /* 'hard' itself only produces 32 bit alignment, yet we need
-           to access it using 64 bit load/store as well. */
+union thread_xstate {
+        struct sh_fpu_hard_struct hardfpu;
+        struct sh_fpu_soft_struct softfpu;
+        /*
+         * The structure definitions only produce 32 bit alignment, yet we need
+         * to access them using 64 bit load/store as well.
+         */
         unsigned long long alignment_dummy;
 };
 
@@ -122,7 +123,7 @@ struct thread_struct {
         /* Hardware debugging registers may come here */
 
         /* floating point info */
-        union sh_fpu_union fpu;
+        union thread_xstate *xstate;
 };
 
 #define INIT_MMAP \
@@ -137,7 +138,6 @@ struct thread_struct {
         .trap_no        = 0,                    \
         .error_code     = 0,                    \
         .address        = 0,                    \
-        .fpu            = { { { 0, } }, }       \
 }
 
 /*