diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-06 09:04:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-06 09:04:35 -0400 |
| commit | c98f5827f8f0e0cb075075def7f0d210992ef06d (patch) | |
| tree | 28d629439a846eac733ab525a0d2d4a8e6a1649c /arch/x86/include/asm/thread_info.h | |
| parent | 1630e843e104528ddf0208dfc692c70c9bd05a89 (diff) | |
| parent | f7d665627e103e82d34306c7d3f6f46f387c0d8b (diff) | |
| download | linux-0-day-c98f5827f8f0e0cb075075def7f0d210992ef06d.tar.gz linux-0-day-c98f5827f8f0e0cb075075def7f0d210992ef06d.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two fixes and a cleanup-fix, to the syscall entry code and to ptrace"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace
x86/ptrace: Stop setting TS_COMPAT in ptrace code
x86/vdso: Error out if the vDSO isn't a valid DSO
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
| -rw-r--r-- | arch/x86/include/asm/thread_info.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index b45ffdda35497..84b59846154a9 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -219,6 +219,9 @@ static inline unsigned long current_stack_pointer(void) * have to worry about atomic accesses. */ #define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/ +#ifdef CONFIG_COMPAT +#define TS_I386_REGS_POKED 0x0004 /* regs poked by 32-bit ptracer */ +#endif #ifndef __ASSEMBLY__ |