diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 06:07:52 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 06:07:52 +0400 |
| commit | 19ba20f455a8e9cf15c12891e751fd73c9026292 (patch) | |
| tree | 7d3322f1170859a2abef4c7fcfeb523266ab73a5 /arch/sparc/include/uapi/asm/unistd.h | |
| parent | 3308ee8f4582f97d1c08864dd06f7291aea323e5 (diff) | |
| parent | a54983ae64b12cf7e098c464c7eaf058752bc9cc (diff) | |
| download | linux-19ba20f455a8e9cf15c12891e751fd73c9026292.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc update from David Miller:
"Two cleanups from Paul Gortmaker and hook up the new scheduler system
calls"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Hook up sched_setattr and sched_getattr syscalls.
sparc: don't use module_init in non-modular pci.c code
sparc: delete non-required instances of include <linux/init.h>
Diffstat (limited to 'arch/sparc/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/sparc/include/uapi/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h index 62ced589bcf7..b73274fb961a 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h @@ -408,8 +408,10 @@ #define __NR_kern_features 340 #define __NR_kcmp 341 #define __NR_finit_module 342 +#define __NR_sched_setattr 343 +#define __NR_sched_getattr 344 -#define NR_syscalls 343 +#define NR_syscalls 345 /* Bitmask values returned from kern_features system call. */ #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 |