[PATCH] Kprobes: Track kprobe on a per_cpu basis - ppc64 changes

[karo-tx-linux.git] / include / asm-powerpc / processor.h

diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h
index 9592f533e0580a46d2e0c43b172d4ffbf147f9cb..1dc4bf7b52b302533b2909ff688d883816cf1b9a 100644 (file)
--- a/include/asm-powerpc/processor.h
+++ b/include/asm-powerpc/processor.h
@@ -70,7 +70,7 @@ extern unsigned char ucBoardRevMaj, ucBoardRevMin;
 #define PLATFORM_LPAR         0x0001
 #define PLATFORM_POWERMAC     0x0400
 #define PLATFORM_MAPLE        0x0500
-#define PLATFORM_BPA          0x1000
+#define PLATFORM_CELL         0x1000
 
 /* Compatibility with drivers coming from PPC32 world */
 #define _machine       (systemcfg->platform)
@@ -162,10 +162,11 @@ struct thread_struct {
        unsigned long   dbcr1;
 #endif
        double          fpr[32];        /* Complete floating point set */
-#ifdef CONFIG_PPC32
-       unsigned long   fpscr_pad;      /* fpr ... fpscr must be contiguous */
-#endif
-       unsigned long   fpscr;          /* Floating point status */
+       struct {                        /* fpr ... fpscr must be contiguous */
+
+               unsigned int pad;
+               unsigned int val;       /* Floating point status */
+       } fpscr;
        int             fpexc_mode;     /* floating-point exception mode */
 #ifdef CONFIG_PPC64
        unsigned long   start_tb;       /* Start purr when proc switched in */
@@ -207,7 +208,7 @@ struct thread_struct {
        .regs = (struct pt_regs *)INIT_SP - 1, /* XXX bogus, I think */ \
        .fs = KERNEL_DS, \
        .fpr = {0}, \
-       .fpscr = 0, \
+       .fpscr = { .val = 0, }, \
        .fpexc_mode = MSR_FE0|MSR_FE1, \
 }
 #endif