ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc

[powerpc.git] / include / asm-powerpc / spu_csa.h

diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h
index d1d537d..ba18d7d 100644 (file)
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
@@ -22,6 +22,7 @@
 
 #ifndef _SPU_CSA_H_
 #define _SPU_CSA_H_
+#ifdef __KERNEL__
 
 /*
  * Total number of 128-bit registers.
@@ -89,8 +90,6 @@ struct spu_lscsa {
        unsigned char ls[LS_SIZE];
 };
 
-#ifdef __KERNEL__
-
 /*
  * struct spu_problem_collapsed - condensed problem state area, w/o pads.
  */
@@ -200,7 +199,6 @@ struct spu_priv2_collapsed {
        u64 spu_chnlcnt_RW;
        u64 spu_chnldata_RW;
        u64 spu_cfg_RW;
-       u64 spu_pm_trace_tag_status_RW;
        u64 spu_tag_status_query_RW;
        u64 spu_cmd_buf1_RW;
        u64 spu_cmd_buf2_RW;
@@ -242,6 +240,7 @@ struct spu_state {
        unsigned long suspend_time;
        u64 slb_esid_RW[8];
        u64 slb_vsid_RW[8];
+       spinlock_t register_lock;
 };
 
 extern void spu_init_csa(struct spu_state *csa);