aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/sh5
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-19 01:40:03 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-01-19 01:40:03 -0500
commit3ef2932b8c1fc89408ef1fd4b1e1c2caabc7f07d (patch)
tree0b12eea51d98e1edd1ef891ed7fe0a7feec4341c /arch/sh/kernel/cpu/sh5
parentcb6d04468d16de5a6161167ec7e76a43be540a80 (diff)
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>
Diffstat (limited to 'arch/sh/kernel/cpu/sh5')
-rw-r--r--arch/sh/kernel/cpu/sh5/fpu.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c
index 4648ccee6c4d..92df285fbe4b 100644
--- a/arch/sh/kernel/cpu/sh5/fpu.c
+++ b/arch/sh/kernel/cpu/sh5/fpu.c
@@ -27,8 +27,8 @@
27#define sNAN64 0xFFFFFFFFFFFFFFFFULL 27#define sNAN64 0xFFFFFFFFFFFFFFFFULL
28#define sNAN32 0xFFFFFFFFUL 28#define sNAN32 0xFFFFFFFFUL
29 29
30static union sh_fpu_union init_fpuregs = { 30static union thread_xstate init_fpuregs = {
31 .hard = { 31 .hardfpu = {
32 .fp_regs = { [0 ... 63] = sNAN32 }, 32 .fp_regs = { [0 ... 63] = sNAN32 },
33 .fpscr = FPSCR_INIT 33 .fpscr = FPSCR_INIT
34 } 34 }
@@ -72,7 +72,7 @@ void save_fpu(struct task_struct *tsk)
72 "fgetscr fr63\n\t" 72 "fgetscr fr63\n\t"
73 "fst.s %0, (32*8), fr63\n\t" 73 "fst.s %0, (32*8), fr63\n\t"
74 : /* no output */ 74 : /* no output */
75 : "r" (&tsk->thread.fpu.hard) 75 : "r" (&tsk->thread.xstate->hardfpu)
76 : "memory"); 76 : "memory");
77} 77}
78 78
@@ -121,7 +121,7 @@ fpload(struct sh_fpu_hard_struct *fpregs)
121 121
122void fpinit(struct sh_fpu_hard_struct *fpregs) 122void fpinit(struct sh_fpu_hard_struct *fpregs)
123{ 123{
124 *fpregs = init_fpuregs.hard; 124 *fpregs = init_fpuregs.hardfpu;
125} 125}
126 126
127asmlinkage void 127asmlinkage void
@@ -157,10 +157,10 @@ do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)
157 157
158 last_task_used_math = current; 158 last_task_used_math = current;
159 if (used_math()) { 159 if (used_math()) {
160 fpload(&current->thread.fpu.hard); 160 fpload(&current->thread.xstate->hardfpu);
161 } else { 161 } else {
162 /* First time FPU user. */ 162 /* First time FPU user. */
163 fpload(&init_fpuregs.hard); 163 fpload(&init_fpuregs.hardfpu);
164 set_used_math(); 164 set_used_math();
165 } 165 }
166 disable_fpu(); 166 disable_fpu();