diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 17:56:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 17:56:42 -0500 |
| commit | 1de8cd3cb9f61e854e743c7210df43db517d4832 (patch) | |
| tree | 2b69c5ba5e4094037fa04d0fcb6c4537c222cde8 /arch/powerpc/platforms/cell/spufs/spufs.h | |
| parent | 1eb1b3b65dc3e3ffcc6a60e115c085c0c11c1077 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/powerpc/platforms/cell/spufs/spufs.h')
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/spufs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h index 15c62d3ca129..3bf908e2873a 100644 --- a/arch/powerpc/platforms/cell/spufs/spufs.h +++ b/arch/powerpc/platforms/cell/spufs/spufs.h | |||
| @@ -314,7 +314,7 @@ extern char *isolated_loader; | |||
| 314 | * we need to call spu_release(ctx) before sleeping, and | 314 | * we need to call spu_release(ctx) before sleeping, and |
| 315 | * then spu_acquire(ctx) when awoken. | 315 | * then spu_acquire(ctx) when awoken. |
| 316 | * | 316 | * |
| 317 | * Returns with state_mutex re-acquired when successfull or | 317 | * Returns with state_mutex re-acquired when successful or |
| 318 | * with -ERESTARTSYS and the state_mutex dropped when interrupted. | 318 | * with -ERESTARTSYS and the state_mutex dropped when interrupted. |
| 319 | */ | 319 | */ |
| 320 | 320 | ||