diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 17:28:08 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 17:28:08 -0600 |
| commit | 179c0ac67b9d947d2de69e9f08a743e7c74a8dce (patch) | |
| tree | 3f3e22af02df6d8e685fb8aa89731f3746306e35 /arch/sparc/include | |
| parent | ad15afb8b9e80bec6c4337369f63207ff59c44ae (diff) | |
| parent | 10cf15e1d1289aa0bf1d26e9f55176b4c7c5c512 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sparc fixes from David Miller:
"Hook up the memfd syscall, and properly claim all PCI resources
discovered when building the PCI device tree"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Hook up memfd_create system call.
sparc64: Properly claim resources as each PCI bus is probed.
sparc64: Skip bogus PCI bridge ranges.
sparc64: Expand PCI bridge probing debug logging.
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/uapi/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h index 886cab456e1..c842a89b119 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h @@ -413,8 +413,9 @@ #define __NR_renameat2 345 #define __NR_seccomp 346 #define __NR_getrandom 347 +#define __NR_memfd_create 348 -#define NR_syscalls 348 +#define NR_syscalls 349 /* Bitmask values returned from kern_features system call. */ #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 |