diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-26 00:15:23 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-26 00:15:23 +0300 |
| commit | 682cb0cd82d526b5d1e8ceaccda4d9b7795db553 (patch) | |
| tree | 494d563751266cd771a85aa2469f114d6cb4c7f4 /arch/sparc/include/uapi/asm/unistd.h | |
| parent | a88164345b81292b55a8d4829fdd35c8d611cd7d (diff) | |
| parent | 079317a65d05ce52b69b7d47fe1fb419d40a4395 (diff) | |
| download | linux-682cb0cd82d526b5d1e8ceaccda4d9b7795db553.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
1) Finally make perf stack backtraces stable on sparc, several problems
(mostly due to the context in which the user copies from the stack
are done) contributed to this.
From Rob Gardner.
2) Export ADI capability if the cpu supports it.
3) Hook up userfaultfd system call.
4) When faults happen during user copies we really have to clean up and
restore the FPU state fully. Also from Rob Gardner
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
tty/serial: Skip 'NULL' char after console break when sysrq enabled
sparc64: fix FP corruption in user copy functions
sparc64: Perf should save/restore fault info
sparc64: Ensure perf can access user stacks
sparc64: Don't set %pil in rtrap_nmi too early
sparc64: Add ADI capability to cpu capabilities
tty: serial: constify sunhv_ops structs
sparc: Hook up userfaultfd system call
Diffstat (limited to 'arch/sparc/include/uapi/asm/unistd.h')
| -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 efe9479f837b..f31a124a8497 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h @@ -417,8 +417,9 @@ #define __NR_bpf 349 #define __NR_execveat 350 #define __NR_membarrier 351 +#define __NR_userfaultfd 352 -#define NR_syscalls 352 +#define NR_syscalls 353 /* Bitmask values returned from kern_features system call. */ #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 |