diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-03-12 15:47:23 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-03-12 15:47:23 +1100 |
| commit | f57e8430bd2546f6dcdf7d58e66b4965e1fd5c56 (patch) | |
| tree | 764069f9371a82723149a7d9e1848da54c3aba02 /include | |
| parent | be521466feb3bb1cd89de82a2b1d080e9ebd3cb6 (diff) | |
| parent | c886c2bf804c029499694adcc0decfdd32a0cd8b (diff) | |
| download | op-kernel-dev-f57e8430bd2546f6dcdf7d58e66b4965e1fd5c56.zip op-kernel-dev-f57e8430bd2546f6dcdf7d58e66b4965e1fd5c56.tar.gz | |
Merge branch 'cell-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/spu.h | 7 | ||||
| -rw-r--r-- | include/asm-powerpc/spu_csa.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index 0f9f2dd2..31d5054 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h @@ -165,6 +165,13 @@ int spu_irq_class_0_bottom(struct spu *spu); int spu_irq_class_1_bottom(struct spu *spu); void spu_irq_setaffinity(struct spu *spu, int cpu); +extern void spu_invalidate_slbs(struct spu *spu); +extern void spu_associate_mm(struct spu *spu, struct mm_struct *mm); + +/* Calls from the memory management to the SPU */ +struct mm_struct; +extern void spu_flush_all_slbs(struct mm_struct *mm); + /* system callbacks from the SPU */ struct spu_syscall_block { u64 nr_ret; diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h index bdbf906..8aad061 100644 --- a/include/asm-powerpc/spu_csa.h +++ b/include/asm-powerpc/spu_csa.h @@ -221,8 +221,6 @@ struct spu_priv2_collapsed { * @spu_chnlcnt_RW: Array of saved channel counts. * @spu_chnldata_RW: Array of saved channel data. * @suspend_time: Time stamp when decrementer disabled. - * @slb_esid_RW: Array of saved SLB esid entries. - * @slb_vsid_RW: Array of saved SLB vsid entries. * * Structure representing the whole of the SPU * context save area (CSA). This struct contains @@ -245,8 +243,6 @@ struct spu_state { u32 spu_mailbox_data[4]; u32 pu_mailbox_data[1]; unsigned long suspend_time; - u64 slb_esid_RW[8]; - u64 slb_vsid_RW[8]; spinlock_t register_lock; }; |
