aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel/cpu/sh5
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-19 15:40:03 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-01-19 15:40:03 +0900
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 4648ccee6c4..92df285fbe4 100644
--- a/arch/sh/kernel/cpu/sh5/fpu.c
+++ b/arch/sh/kernel/cpu/sh5/fpu.c
@@ -27,8 +27,8 @@
#define sNAN64 0xFFFFFFFFFFFFFFFFULL
#define sNAN32 0xFFFFFFFFUL
-static union sh_fpu_union init_fpuregs = {
- .hard = {
+static union thread_xstate init_fpuregs = {
+ .hardfpu = {
.fp_regs = { [0 ... 63] = sNAN32 },
.fpscr = FPSCR_INIT
}
@@ -72,7 +72,7 @@ void save_fpu(struct task_struct *tsk)
"fgetscr fr63\n\t"
"fst.s %0, (32*8), fr63\n\t"
: /* no output */
- : "r" (&tsk->thread.fpu.hard)
+ : "r" (&tsk->thread.xstate->hardfpu)
: "memory");
}
@@ -121,7 +121,7 @@ fpload(struct sh_fpu_hard_struct *fpregs)
void fpinit(struct sh_fpu_hard_struct *fpregs)
{
- *fpregs = init_fpuregs.hard;
+ *fpregs = init_fpuregs.hardfpu;
}
asmlinkage void
@@ -157,10 +157,10 @@ do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)
last_task_used_math = current;
if (used_math()) {
- fpload(&current->thread.fpu.hard);
+ fpload(&current->thread.xstate->hardfpu);
} else {
/* First time FPU user. */
- fpload(&init_fpuregs.hard);
+ fpload(&init_fpuregs.hardfpu);
set_used_math();
}
disable_fpu();