Merge branch 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / arch / sh / kernel / traps_64.c

diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index d86f531..e67e140 100644 (file)
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -611,19 +611,19 @@ static int misaligned_fpu_load(struct pt_regs *regs,
 
                switch (width_shift) {
                case 2:
-                       current->thread.fpu.hard.fp_regs[destreg] = buflo;
+                       current->thread.xstate->hardfpu.fp_regs[destreg] = buflo;
                        break;
                case 3:
                        if (do_paired_load) {
-                               current->thread.fpu.hard.fp_regs[destreg] = buflo;
-                               current->thread.fpu.hard.fp_regs[destreg+1] = bufhi;
+                               current->thread.xstate->hardfpu.fp_regs[destreg] = buflo;
+                               current->thread.xstate->hardfpu.fp_regs[destreg+1] = bufhi;
                        } else {
 #if defined(CONFIG_CPU_LITTLE_ENDIAN)
-                               current->thread.fpu.hard.fp_regs[destreg] = bufhi;
-                               current->thread.fpu.hard.fp_regs[destreg+1] = buflo;
+                               current->thread.xstate->hardfpu.fp_regs[destreg] = bufhi;
+                               current->thread.xstate->hardfpu.fp_regs[destreg+1] = buflo;
 #else
-                               current->thread.fpu.hard.fp_regs[destreg] = buflo;
-                               current->thread.fpu.hard.fp_regs[destreg+1] = bufhi;
+                               current->thread.xstate->hardfpu.fp_regs[destreg] = buflo;
+                               current->thread.xstate->hardfpu.fp_regs[destreg+1] = bufhi;
 #endif
                        }
                        break;
@@ -681,19 +681,19 @@ static int misaligned_fpu_store(struct pt_regs *regs,
 
                switch (width_shift) {
                case 2:
-                       buflo = current->thread.fpu.hard.fp_regs[srcreg];
+                       buflo = current->thread.xstate->hardfpu.fp_regs[srcreg];
                        break;
                case 3:
                        if (do_paired_load) {
-                               buflo = current->thread.fpu.hard.fp_regs[srcreg];
-                               bufhi = current->thread.fpu.hard.fp_regs[srcreg+1];
+                               buflo = current->thread.xstate->hardfpu.fp_regs[srcreg];
+                               bufhi = current->thread.xstate->hardfpu.fp_regs[srcreg+1];
                        } else {
 #if defined(CONFIG_CPU_LITTLE_ENDIAN)
-                               bufhi = current->thread.fpu.hard.fp_regs[srcreg];
-                               buflo = current->thread.fpu.hard.fp_regs[srcreg+1];
+                               bufhi = current->thread.xstate->hardfpu.fp_regs[srcreg];
+                               buflo = current->thread.xstate->hardfpu.fp_regs[srcreg+1];
 #else
-                               buflo = current->thread.fpu.hard.fp_regs[srcreg];
-                               bufhi = current->thread.fpu.hard.fp_regs[srcreg+1];
+                               buflo = current->thread.xstate->hardfpu.fp_regs[srcreg];
+                               bufhi = current->thread.xstate->hardfpu.fp_regs[srcreg+1];
 #endif
                        }
                        break;
@@ -944,3 +944,8 @@ asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs)
        /* Clear all DEBUGINT causes */
        poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0);
 }
+
+void __cpuinit per_cpu_trap_init(void)
+{
+       /* Nothing to do for now, VBR initialization later. */
+}