diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /include/asm-generic/syscall.h | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'include/asm-generic/syscall.h')
| -rw-r--r-- | include/asm-generic/syscall.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h index abcf34c2fdc7..ea8087b55ffc 100644 --- a/include/asm-generic/syscall.h +++ b/include/asm-generic/syscall.h | |||
| @@ -126,7 +126,7 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, | |||
| 126 | * @args: array of argument values to store | 126 | * @args: array of argument values to store |
| 127 | * | 127 | * |
| 128 | * Changes @n arguments to the system call starting with the @i'th argument. | 128 | * Changes @n arguments to the system call starting with the @i'th argument. |
| 129 | * @n'th argument to @val. Argument @i gets value @args[0], and so on. | 129 | * Argument @i gets value @args[0], and so on. |
| 130 | * An arch inline version is probably optimal when @i and @n are constants. | 130 | * An arch inline version is probably optimal when @i and @n are constants. |
| 131 | * | 131 | * |
| 132 | * It's only valid to call this when @task is stopped for tracing on | 132 | * It's only valid to call this when @task is stopped for tracing on |