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

[karo-tx-linux.git] / arch / powerpc / kernel / softemu8xx.c

diff --git a/arch/powerpc/kernel/softemu8xx.c b/arch/powerpc/kernel/softemu8xx.c
index 67d6f6890edcb50bfddf8892d9a4ebc8359fd29a..c906c4bf68357f7fb65dcf19298269a6d03cfafd 100644 (file)
--- a/arch/powerpc/kernel/softemu8xx.c
+++ b/arch/powerpc/kernel/softemu8xx.c
@@ -124,7 +124,7 @@ int Soft_emulate_8xx(struct pt_regs *regs)
        disp = instword & 0xffff;
 
        ea = (u32 *)(regs->gpr[idxreg] + disp);
-       ip = (u32 *)&current->thread.fpr[flreg];
+       ip = (u32 *)&current->thread.TS_FPR(flreg);
 
        switch ( inst )
        {
@@ -168,7 +168,7 @@ int Soft_emulate_8xx(struct pt_regs *regs)
                break;
        case FMR:
                /* assume this is a fp move -- Cort */
-               memcpy(ip, &current->thread.fpr[(instword>>11)&0x1f],
+               memcpy(ip, &current->thread.TS_FPR((instword>>11)&0x1f),
                       sizeof(double));
                break;
        default: