diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-22 04:19:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-22 04:19:30 -0400 |
| commit | eff430de53be6f3328c3eebe93755f1ecf499e37 (patch) | |
| tree | c8e5ae958fe3e6656b4e96c83bbda17e649321a2 /kernel/signal.c | |
| parent | 9cbdb702092a2d82f909312f4ec3eeded77bb82e (diff) | |
| parent | 91e8549bde9e5cc88c5a2e8c8114389279e240b5 (diff) | |
Merge branch 'linus' into perf/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 29e233fd7a0f..7165af5f1b11 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -2711,8 +2711,8 @@ out: | |||
| 2711 | /** | 2711 | /** |
| 2712 | * sys_rt_sigaction - alter an action taken by a process | 2712 | * sys_rt_sigaction - alter an action taken by a process |
| 2713 | * @sig: signal to be sent | 2713 | * @sig: signal to be sent |
| 2714 | * @act: the thread group ID of the thread | 2714 | * @act: new sigaction |
| 2715 | * @oact: the PID of the thread | 2715 | * @oact: used to save the previous sigaction |
| 2716 | * @sigsetsize: size of sigset_t type | 2716 | * @sigsetsize: size of sigset_t type |
| 2717 | */ | 2717 | */ |
| 2718 | SYSCALL_DEFINE4(rt_sigaction, int, sig, | 2718 | SYSCALL_DEFINE4(rt_sigaction, int, sig, |