linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h
index 964c2d3..ba18d7d 100644 (file)
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
@@ -86,18 +86,10 @@ struct spu_lscsa {
        struct spu_reg128 event_mask;
        struct spu_reg128 srr0;
        struct spu_reg128 stopped_status;
-
-       /*
-        * 'ls' must be page-aligned on all configurations.
-        * Since we don't want to rely on having the spu-gcc
-        * installed to build the kernel and this structure
-        * is used in the SPU-side code, make it 64k-page
-        * aligned for now.
-        */
-       unsigned char ls[LS_SIZE] __attribute__((aligned(65536)));
+       struct spu_reg128 pad[119];     /* 'ls' must be page-aligned. */
+       unsigned char ls[LS_SIZE];
 };
 
-#ifndef __SPU__
 /*
  * struct spu_problem_collapsed - condensed problem state area, w/o pads.
  */
@@ -258,7 +250,6 @@ extern int spu_restore(struct spu_state *new, struct spu *spu);
 extern int spu_switch(struct spu_state *prev, struct spu_state *new,
                      struct spu *spu);
 
-#endif /* !__SPU__ */
 #endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
 #endif /* _SPU_CSA_H_ */