Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / powerpc / include / asm / spu_info.h

diff --git a/arch/powerpc/include/asm/spu_info.h b/arch/powerpc/include/asm/spu_info.h
index 1286c82..7146b78 100644 (file)
--- a/arch/powerpc/include/asm/spu_info.h
+++ b/arch/powerpc/include/asm/spu_info.h
@@ -19,37 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #ifndef _SPU_INFO_H
 #define _SPU_INFO_H
 
-#include <linux/types.h>
-
-#ifdef __KERNEL__
 #include <asm/spu.h>
-#else
-struct mfc_cq_sr {
-       __u64 mfc_cq_data0_RW;
-       __u64 mfc_cq_data1_RW;
-       __u64 mfc_cq_data2_RW;
-       __u64 mfc_cq_data3_RW;
-};
-#endif /* __KERNEL__ */
-
-struct spu_dma_info {
-       __u64 dma_info_type;
-       __u64 dma_info_mask;
-       __u64 dma_info_status;
-       __u64 dma_info_stall_and_notify;
-       __u64 dma_info_atomic_command_status;
-       struct mfc_cq_sr dma_info_command_data[16];
-};
-
-struct spu_proxydma_info {
-       __u64 proxydma_info_type;
-       __u64 proxydma_info_mask;
-       __u64 proxydma_info_status;
-       struct mfc_cq_sr proxydma_info_command_data[8];
-};
+#include <uapi/asm/spu_info.h>
 
 #endif