Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[linux-2.6] / include / asm-powerpc / spu_csa.h

diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h
index 989a0688144efeae7374608b48a95f1dee69e67a..ba18d7d4dde21d013ef68ab8983db9c4c05e96b1 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.
  */
@@ -241,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);