Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / sh / kernel / process_64.c

diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index ec79faf6f0216153897a4e664044e214c5a4c8b2..c90957a459ac9f59bf85d82f68b2c6caba917071 100644 (file)
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -32,30 +32,7 @@
 
 struct task_struct *last_task_used_math = NULL;
 
-void machine_restart(char * __unused)
-{
-       extern void phys_stext(void);
-
-       phys_stext();
-}
-
-void machine_halt(void)
-{
-       for (;;);
-}
-
-void machine_power_off(void)
-{
-       __asm__ __volatile__ (
-               "sleep\n\t"
-               "synci\n\t"
-               "nop;nop;nop;nop\n\t"
-       );
-
-       panic("Unexpected wakeup!\n");
-}
-
-void show_regs(struct pt_regs * regs)
+void show_regs(struct pt_regs *regs)
 {
        unsigned long long ah, al, bh, bl, ch, cl;
 
@@ -410,7 +387,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
                        regs->sr |= SR_FD;
                }
 
-               memcpy(fpu, &tsk->thread.fpu.hard, sizeof(*fpu));
+               memcpy(fpu, &tsk->thread.xstate->hardfpu, sizeof(*fpu));
        }
 
        return fpvalid;