include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / arch / powerpc / kernel / softemu8xx.c

diff --git a/arch/powerpc/kernel/softemu8xx.c b/arch/powerpc/kernel/softemu8xx.c
index 67d6f68..af0e829 100644 (file)
--- a/arch/powerpc/kernel/softemu8xx.c
+++ b/arch/powerpc/kernel/softemu8xx.c
@@ -21,9 +21,7 @@
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
-#include <linux/slab.h>
 #include <linux/user.h>
-#include <linux/a.out.h>
 #include <linux/interrupt.h>
 
 #include <asm/pgtable.h>
@@ -124,7 +122,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 +166,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: