aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/syscall_table.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-23 00:13:26 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-23 00:13:26 -0500
commit5f32ed140dac726e880d292988ba20d16f545bda (patch)
treef08589f9489a05eb7a0b7f855ab96c57b0561cde /arch/parisc/kernel/syscall_table.S
parentc68fea3464cbe4f3e1382f9f74a7c04cdbfb92ad (diff)
parent1dda59b4f3d03fa28d86f3ea235655f0f96aab3e (diff)
Merge branch 'parisc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller. The bulk of this is optimized page coping/clearing and cache flushing (virtual caches are lovely) by John David Anglin. * 'parisc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: (31 commits) arch/parisc/include/asm: use ARRAY_SIZE macro in mmzone.h parisc: remove empty lines and unnecessary #ifdef coding in include/asm/signal.h parisc: sendfile and sendfile64 syscall cleanups parisc: switch to available compat_sched_rr_get_interval implementation parisc: fix fallocate syscall parisc: fix error return codes for rt_sigaction and rt_sigprocmask parisc: convert msgrcv and msgsnd syscalls to use compat layer parisc: correctly wire up mq_* functions for CONFIG_COMPAT case parisc: fix personality on 32bit kernel parisc: wire up process_vm_readv, process_vm_writev, kcmp and finit_module syscalls parisc: led driver requires CONFIG_VM_EVENT_COUNTERS parisc: remove unused compat_rt_sigframe.h header parisc/mm/fault.c: Port OOM changes to do_page_fault parisc: space register variables need to be in native length (unsigned long) parisc: fix ptrace breakage parisc: always detect multiple physical ranges parisc: ensure that mmapped shared pages are aligned at SHMLBA addresses parisc: disable preemption while flushing D- or I-caches through TMPALIAS region parisc: remove IRQF_DISABLED parisc: fixes and cleanups in page cache flushing (4/4) ...
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
-rw-r--r--arch/parisc/kernel/syscall_table.S27
1 files changed, 14 insertions, 13 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 54d950b067b7..129fd472c471 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -247,10 +247,7 @@
247 ENTRY_SAME(sched_yield) 247 ENTRY_SAME(sched_yield)
248 ENTRY_SAME(sched_get_priority_max) 248 ENTRY_SAME(sched_get_priority_max)
249 ENTRY_SAME(sched_get_priority_min) /* 160 */ 249 ENTRY_SAME(sched_get_priority_min) /* 160 */
250 /* These 2 would've worked if someone had defined struct timespec 250 ENTRY_COMP(sched_rr_get_interval)
251 * carefully, like timeval for example (which is about the same).
252 * Unfortunately it contains a long :-( */
253 ENTRY_DIFF(sched_rr_get_interval)
254 ENTRY_COMP(nanosleep) 251 ENTRY_COMP(nanosleep)
255 ENTRY_SAME(mremap) 252 ENTRY_SAME(mremap)
256 ENTRY_SAME(setresuid) 253 ENTRY_SAME(setresuid)
@@ -286,8 +283,8 @@
286 ENTRY_SAME(semop) /* 185 */ 283 ENTRY_SAME(semop) /* 185 */
287 ENTRY_SAME(semget) 284 ENTRY_SAME(semget)
288 ENTRY_DIFF(semctl) 285 ENTRY_DIFF(semctl)
289 ENTRY_DIFF(msgsnd) 286 ENTRY_COMP(msgsnd)
290 ENTRY_DIFF(msgrcv) 287 ENTRY_COMP(msgrcv)
291 ENTRY_SAME(msgget) /* 190 */ 288 ENTRY_SAME(msgget) /* 190 */
292 ENTRY_SAME(msgctl) 289 ENTRY_SAME(msgctl)
293 ENTRY_SAME(shmat) 290 ENTRY_SAME(shmat)
@@ -307,7 +304,7 @@
307 ENTRY_SAME(gettid) 304 ENTRY_SAME(gettid)
308 ENTRY_OURS(readahead) 305 ENTRY_OURS(readahead)
309 ENTRY_SAME(tkill) 306 ENTRY_SAME(tkill)
310 ENTRY_SAME(sendfile64) 307 ENTRY_DIFF(sendfile64)
311 ENTRY_COMP(futex) /* 210 */ 308 ENTRY_COMP(futex) /* 210 */
312 ENTRY_COMP(sched_setaffinity) 309 ENTRY_COMP(sched_setaffinity)
313 ENTRY_COMP(sched_getaffinity) 310 ENTRY_COMP(sched_getaffinity)
@@ -327,12 +324,12 @@
327 ENTRY_SAME(epoll_wait) 324 ENTRY_SAME(epoll_wait)
328 ENTRY_SAME(remap_file_pages) 325 ENTRY_SAME(remap_file_pages)
329 ENTRY_SAME(semtimedop) 326 ENTRY_SAME(semtimedop)
330 ENTRY_SAME(mq_open) 327 ENTRY_COMP(mq_open)
331 ENTRY_SAME(mq_unlink) /* 230 */ 328 ENTRY_SAME(mq_unlink) /* 230 */
332 ENTRY_SAME(mq_timedsend) 329 ENTRY_COMP(mq_timedsend)
333 ENTRY_SAME(mq_timedreceive) 330 ENTRY_COMP(mq_timedreceive)
334 ENTRY_SAME(mq_notify) 331 ENTRY_COMP(mq_notify)
335 ENTRY_SAME(mq_getsetattr) 332 ENTRY_COMP(mq_getsetattr)
336 ENTRY_COMP(waitid) /* 235 */ 333 ENTRY_COMP(waitid) /* 235 */
337 ENTRY_OURS(fadvise64_64) 334 ENTRY_OURS(fadvise64_64)
338 ENTRY_SAME(set_tid_address) 335 ENTRY_SAME(set_tid_address)
@@ -403,7 +400,7 @@
403 ENTRY_COMP(signalfd) 400 ENTRY_COMP(signalfd)
404 ENTRY_SAME(ni_syscall) /* was timerfd */ 401 ENTRY_SAME(ni_syscall) /* was timerfd */
405 ENTRY_SAME(eventfd) 402 ENTRY_SAME(eventfd)
406 ENTRY_COMP(fallocate) /* 305 */ 403 ENTRY_OURS(fallocate) /* 305 */
407 ENTRY_SAME(timerfd_create) 404 ENTRY_SAME(timerfd_create)
408 ENTRY_COMP(timerfd_settime) 405 ENTRY_COMP(timerfd_settime)
409 ENTRY_COMP(timerfd_gettime) 406 ENTRY_COMP(timerfd_gettime)
@@ -428,6 +425,10 @@
428 ENTRY_SAME(syncfs) 425 ENTRY_SAME(syncfs)
429 ENTRY_SAME(setns) 426 ENTRY_SAME(setns)
430 ENTRY_COMP(sendmmsg) 427 ENTRY_COMP(sendmmsg)
428 ENTRY_COMP(process_vm_readv) /* 330 */
429 ENTRY_COMP(process_vm_writev)
430 ENTRY_SAME(kcmp)
431 ENTRY_SAME(finit_module)
431 432
432 /* Nothing yet */ 433 /* Nothing yet */
433 434