diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-10-10 07:56:00 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-10-10 07:56:00 +0400 |
| commit | fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db (patch) | |
| tree | da956b424090e478c680d568f81ad509def4de03 /arch/powerpc/include/asm/spu_info.h | |
| parent | 547b1e81afe3119f7daf702cc03b158495535a25 (diff) | |
| parent | c3617f72036c909e1f6086b5b9e364e0ef90a6da (diff) | |
| download | linux-fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db.tar.xz | |
Merge tag 'disintegrate-powerpc-20121009' into merge
UAPI Disintegration 2012-10-09
Diffstat (limited to 'arch/powerpc/include/asm/spu_info.h')
| -rw-r--r-- | arch/powerpc/include/asm/spu_info.h | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/arch/powerpc/include/asm/spu_info.h b/arch/powerpc/include/asm/spu_info.h index 1286c823f0d8..7146b78e40f1 100644 --- 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 |