diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-24 11:45:03 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-24 11:45:03 +1000 |
| commit | 13177c8b7eaf7ab238e79533c746153ae116f5f8 (patch) | |
| tree | 4a4675749672f201c23d6df82ee2b39eedff76f2 /include/asm-powerpc | |
| parent | 445c9b5507b9d09a2e9b0b4dbb16517708aa40e6 (diff) | |
| parent | ccf17e9d008dfebbf90dfa4ee1a56e81c784c73e (diff) | |
Merge branch 'spufs' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into for-2.6.22
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/mmu.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/spu_csa.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index 200055a4b82..e22fd881150 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h @@ -234,6 +234,7 @@ extern int __hash_page_64K(unsigned long ea, unsigned long access, unsigned long vsid, pte_t *ptep, unsigned long trap, unsigned int local); struct mm_struct; +extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); extern int hash_huge_page(struct mm_struct *mm, unsigned long access, unsigned long ea, unsigned long vsid, int local, unsigned long trap); diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h index 8aad0619eb8..02e56a6685a 100644 --- a/include/asm-powerpc/spu_csa.h +++ b/include/asm-powerpc/spu_csa.h @@ -242,6 +242,7 @@ struct spu_state { u64 spu_chnldata_RW[32]; u32 spu_mailbox_data[4]; u32 pu_mailbox_data[1]; + u64 dar, dsisr; unsigned long suspend_time; spinlock_t register_lock; }; |