diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/filesystems/spufs.txt | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/filesystems/spufs.txt')
| -rw-r--r-- | Documentation/filesystems/spufs.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/filesystems/spufs.txt b/Documentation/filesystems/spufs.txt index 8edc3952eff4..982645a1981d 100644 --- a/Documentation/filesystems/spufs.txt +++ b/Documentation/filesystems/spufs.txt | |||
| @@ -84,7 +84,7 @@ FILES | |||
| 84 | /ibox | 84 | /ibox |
| 85 | The second SPU to CPU communication mailbox. This file is similar to | 85 | The second SPU to CPU communication mailbox. This file is similar to |
| 86 | the first mailbox file, but can be read in blocking I/O mode, and the | 86 | the first mailbox file, but can be read in blocking I/O mode, and the |
| 87 | poll familiy of system calls can be used to wait for it. The possible | 87 | poll family of system calls can be used to wait for it. The possible |
| 88 | operations on an open ibox file are: | 88 | operations on an open ibox file are: |
| 89 | 89 | ||
| 90 | read(2) | 90 | read(2) |
| @@ -105,7 +105,7 @@ FILES | |||
| 105 | 105 | ||
| 106 | 106 | ||
| 107 | /wbox | 107 | /wbox |
| 108 | The CPU to SPU communation mailbox. It is write-only can can be written | 108 | The CPU to SPU communation mailbox. It is write-only and can be written |
| 109 | in units of 32 bits. If the mailbox is full, write() will block and | 109 | in units of 32 bits. If the mailbox is full, write() will block and |
| 110 | poll can be used to wait for it becoming empty again. The possible | 110 | poll can be used to wait for it becoming empty again. The possible |
| 111 | operations on an open wbox file are: write(2) If a count smaller than | 111 | operations on an open wbox file are: write(2) If a count smaller than |
| @@ -359,7 +359,7 @@ ERRORS | |||
| 359 | EFAULT npc is not a valid pointer or status is neither NULL nor a valid | 359 | EFAULT npc is not a valid pointer or status is neither NULL nor a valid |
| 360 | pointer. | 360 | pointer. |
| 361 | 361 | ||
| 362 | EINTR A signal occured while spu_run was in progress. The npc value | 362 | EINTR A signal occurred while spu_run was in progress. The npc value |
| 363 | has been updated to the new program counter value if necessary. | 363 | has been updated to the new program counter value if necessary. |
| 364 | 364 | ||
| 365 | EINVAL fd is not a file descriptor returned from spu_create(2). | 365 | EINVAL fd is not a file descriptor returned from spu_create(2). |