diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /arch/cris/arch-v32/kernel/signal.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'arch/cris/arch-v32/kernel/signal.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index da7d2be000ba..372d0ca6efbc 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
| @@ -456,7 +456,7 @@ give_sigsegv: | |||
| 456 | return -EFAULT; | 456 | return -EFAULT; |
| 457 | } | 457 | } |
| 458 | 458 | ||
| 459 | /* Invoke a singal handler to, well, handle the signal. */ | 459 | /* Invoke a signal handler to, well, handle the signal. */ |
| 460 | static inline int | 460 | static inline int |
| 461 | handle_signal(int canrestart, unsigned long sig, | 461 | handle_signal(int canrestart, unsigned long sig, |
| 462 | siginfo_t *info, struct k_sigaction *ka, | 462 | siginfo_t *info, struct k_sigaction *ka, |