diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-14 01:24:25 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-14 01:24:25 +1000 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /include/asm-powerpc | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
| download | op-kernel-dev-b2315372eac9cd9f622c32a93e323cf6f0f03462.zip op-kernel-dev-b2315372eac9cd9f622c32a93e323cf6f0f03462.tar.gz | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/spu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index 8836c0f..5bde398 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h @@ -130,6 +130,7 @@ struct spu { u64 flags; u64 dar; u64 dsisr; + u64 class_0_pending; size_t ls_size; unsigned int slb_replace; struct mm_struct *mm; @@ -138,7 +139,6 @@ struct spu { unsigned long long timestamp; pid_t pid; pid_t tgid; - int class_0_pending; spinlock_t register_lock; void (* wbox_callback)(struct spu *spu); |
