Merge tag 'please-pull-ia64-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

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

kernel os linux

Pull ia64 update from Tony Luck:
"Wire up new sched_setattr and sched_getattr syscalls"

* tag 'please-pull-ia64-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Wire up new sched_setattr and sched_getattr syscalls

Linus Torvalds 12 years ago 251aa0fd 8352650a

+5 -1

3 changed files

expand all

arch

ia64

include

asm

unistd.h

uapi

asm

unistd.h

kernel

entry.S

+1 -1

arch/ia64/include/asm/unistd.h

··· 11 11 12 12 13 13 14 - #define NR_syscalls 312 /* length of syscall table */ 14 + #define NR_syscalls 314 /* length of syscall table */ 15 15 16 16 /* 17 17 * The following defines stop scripts/checksyscalls.sh from complaining about

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

··· 325 325 #define __NR_process_vm_writev 1333 326 326 #define __NR_accept4 1334 327 327 #define __NR_finit_module 1335 328 + #define __NR_sched_setattr 1336 329 + #define __NR_sched_getattr 1337 328 330 329 331 #endif /* _UAPI_ASM_IA64_UNISTD_H */

arch/ia64/kernel/entry.S

··· 1773 1773 data8 sys_process_vm_writev 1774 1774 data8 sys_accept4 1775 1775 data8 sys_finit_module // 1335 1776 + data8 sys_sched_setattr 1777 + data8 sys_sched_getattr 1776 1778 1777 1779 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1778 1780 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */