diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-03-12 00:47:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-03-12 00:47:23 -0400 |
| commit | f57e8430bd2546f6dcdf7d58e66b4965e1fd5c56 (patch) | |
| tree | 764069f9371a82723149a7d9e1848da54c3aba02 /arch/powerpc/platforms/cell/spufs/run.c | |
| parent | be521466feb3bb1cd89de82a2b1d080e9ebd3cb6 (diff) | |
| parent | c886c2bf804c029499694adcc0decfdd32a0cd8b (diff) | |
Merge branch 'cell-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'arch/powerpc/platforms/cell/spufs/run.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/run.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index 353a8fa07ab8..f95a611ca362 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
| @@ -143,7 +143,7 @@ static inline int spu_run_init(struct spu_context *ctx, u32 * npc) | |||
| 143 | int ret; | 143 | int ret; |
| 144 | unsigned long runcntl = SPU_RUNCNTL_RUNNABLE; | 144 | unsigned long runcntl = SPU_RUNCNTL_RUNNABLE; |
| 145 | 145 | ||
| 146 | ret = spu_acquire_runnable(ctx, SPU_ACTIVATE_NOWAKE); | 146 | ret = spu_acquire_runnable(ctx, 0); |
| 147 | if (ret) | 147 | if (ret) |
| 148 | return ret; | 148 | return ret; |
| 149 | 149 | ||
| @@ -155,7 +155,7 @@ static inline int spu_run_init(struct spu_context *ctx, u32 * npc) | |||
| 155 | spu_release(ctx); | 155 | spu_release(ctx); |
| 156 | ret = spu_setup_isolated(ctx); | 156 | ret = spu_setup_isolated(ctx); |
| 157 | if (!ret) | 157 | if (!ret) |
| 158 | ret = spu_acquire_runnable(ctx, SPU_ACTIVATE_NOWAKE); | 158 | ret = spu_acquire_runnable(ctx, 0); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | /* if userspace has set the runcntrl register (eg, to issue an | 161 | /* if userspace has set the runcntrl register (eg, to issue an |