summaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/syscall_table.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-03 21:57:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-03 21:57:38 +0100
commit6977c6fc77b864dc1851e100c8528c2f3ed5bd9b (patch)
treed43b5e8e33a01ebf7a4f356342c700e4f46ec8e3 /arch/parisc/kernel/syscall_table.S
parentMerge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentparisc: fix redefinition of SET_PERSONALITY (diff)
downloadlinux-6977c6fc77b864dc1851e100c8528c2f3ed5bd9b.tar.xz
linux-6977c6fc77b864dc1851e100c8528c2f3ed5bd9b.zip
Merge branch 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull second round of PARISC updates from Helge Deller: "The most important fix in this branch is the switch of io_setup, io_getevents and io_submit syscalls to use the available compat syscalls when running 32bit userspace on 64bit kernel. Other than that it's mostly removal of compile warnings." * 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: fix redefinition of SET_PERSONALITY parisc: do not install modules when installing kernel parisc: fix compile warnings triggered by atomic_sub(sizeof(),v) parisc: check return value of down_interruptible() in hp_sdc_rtc.c parisc: avoid unitialized variable warning in pa_memcpy() parisc: remove unused variable 'compat_val' parisc: switch to compat_functions of io_setup, io_getevents and io_submit parisc: select ARCH_WANT_FRAME_POINTERS
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
-rw-r--r--arch/parisc/kernel/syscall_table.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 884b91b028f0..f57dc137b8dd 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -310,10 +310,10 @@
ENTRY_COMP(sched_getaffinity)
ENTRY_SAME(ni_syscall) /* set_thread_area */
ENTRY_SAME(ni_syscall) /* get_thread_area */
- ENTRY_SAME(io_setup) /* 215 */
+ ENTRY_COMP(io_setup) /* 215 */
ENTRY_SAME(io_destroy)
- ENTRY_SAME(io_getevents)
- ENTRY_SAME(io_submit)
+ ENTRY_COMP(io_getevents)
+ ENTRY_COMP(io_submit)
ENTRY_SAME(io_cancel)
ENTRY_SAME(alloc_hugepages) /* 220 */
ENTRY_SAME(free_hugepages)