vserver 1.9.3

[linux-2.6.git] / include / asm-ppc64 / paca.h

diff --git a/include/asm-ppc64/paca.h b/include/asm-ppc64/paca.h
index 851082c..71de51a 100644 (file)
--- a/include/asm-ppc64/paca.h
+++ b/include/asm-ppc64/paca.h
@@ -16,6 +16,7 @@
  * 2 of the License, or (at your option) any later version.
  */    
 
+#include       <linux/config.h>
 #include       <asm/types.h>
 #include       <asm/iSeries/ItLpPaca.h>
 #include       <asm/iSeries/ItLpRegSave.h>
@@ -78,7 +79,6 @@ struct paca_struct {
        u64 exmc[8];            /* used for machine checks */
        u64 exslb[8];           /* used for SLB/segment table misses
                                 * on the linear mapping */
-       u64 slb_r3;             /* spot to save R3 on SLB miss */
        mm_context_t context;
        u16 slb_cache[SLB_CACHE_ENTRIES];
        u16 slb_cache_ptr;
@@ -104,22 +104,9 @@ struct paca_struct {
         * The lppaca is also used on POWER5 pSeries boxes.
         */
        struct ItLpPaca lppaca __attribute__((aligned(0x80)));
+#ifdef CONFIG_PPC_ISERIES
        struct ItLpRegSave reg_save;
-
-       /*
-        * iSeries profiling support
-        *
-        * FIXME: do we still want this, or can we ditch it in favour
-        * of oprofile?
-        */
-       u32 *prof_buffer;               /* iSeries profiling buffer */
-       u32 *prof_stext;                /* iSeries start of kernel text */
-       u32 prof_multiplier;
-       u32 prof_counter;
-       u32 prof_shift;                 /* iSeries shift for profile
-                                        * bucket size */
-       u32 prof_len;                   /* iSeries length of profile */
-       u8 prof_enabled;                /* 1=iSeries profiling enabled */
+#endif
 };
 
 #endif /* _PPC64_PACA_H */