summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-05-06 20:57:11 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-05-19 18:19:10 +0200
commitd6d42bb2f85d875dc0c421699de5a1401b2af6a6 (patch)
tree4cdc849e40ba0c2a84481a8e05b1501608165ca3 /arch/m68k
parentc4245c9d6535f3d02fda7f6eb9adcec9f09e8fe3 (diff)
m68k: Really wire up sys_pselect6 and sys_ppoll
We reserved the numbers a long time ago, but never wired them up in the syscall table as they need TIF_RESTORE_SIGMASK, which we only got last year in commit cb6831d5d3099e772a510eb3e1ed0760ccffb45e ("m68k: Switch to saner sigsuspend()") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer <gerg@uclinux.org> Cc: stable@kernel.org
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/kernel/syscalltable.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
index 0284192f84f..5909e392cb1 100644
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
@@ -322,8 +322,8 @@ ENTRY(sys_call_table)
.long sys_readlinkat
.long sys_fchmodat
.long sys_faccessat /* 300 */
- .long sys_ni_syscall /* Reserved for pselect6 */
- .long sys_ni_syscall /* Reserved for ppoll */
+ .long sys_pselect6
+ .long sys_ppoll
.long sys_unshare
.long sys_set_robust_list
.long sys_get_robust_list /* 305 */