Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull sparc fix from David Miller:
"Need to hook up the new renameat2 system call"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Hook up renameat2 syscall.

Linus Torvalds 11 years ago 89faa06e 14867719

+6 -1

4 changed files

expand all

arch

sparc

include

uapi

asm

unistd.h

kernel

sys32.S

systbls_32.S

systbls_64.S

+2 -1

arch/sparc/include/uapi/asm/unistd.h

··· 410 410 #define __NR_finit_module 342 411 411 #define __NR_sched_setattr 343 412 412 #define __NR_sched_getattr 344 413 + #define __NR_renameat2 345 413 414 414 - #define NR_syscalls 345 415 + #define NR_syscalls 346 415 416 416 417 /* Bitmask values returned from kern_features system call. */ 417 418 #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001

arch/sparc/kernel/sys32.S

··· 48 48 SIGN1(sys32_recvfrom, compat_sys_recvfrom, %o0) 49 49 SIGN1(sys32_recvmsg, compat_sys_recvmsg, %o0) 50 50 SIGN1(sys32_sendmsg, compat_sys_sendmsg, %o0) 51 + SIGN2(sys32_renameat2, sys_renameat2, %o0, %o2) 51 52 52 53 .globl sys32_mmap2 53 54 sys32_mmap2:

arch/sparc/kernel/systbls_32.S

··· 86 86 /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime 87 87 /*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev 88 88 /*340*/ .long sys_ni_syscall, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr 89 + /*345*/ .long sys_renameat2

arch/sparc/kernel/systbls_64.S

··· 87 87 /*330*/ .word compat_sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime 88 88 .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev 89 89 /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr 90 + .word sys32_renameat2 90 91 91 92 #endif /* CONFIG_COMPAT */ 92 93 ··· 166 165 /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime 167 166 .word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev 168 167 /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr 168 + .word sys_renameat2