diff options
| author | Linus Torvalds | 2014-10-14 02:28:16 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-10-14 02:28:16 +0200 |
| commit | 2fd7476de999124bbf6830aa59ac092c882280fe (patch) | |
| tree | 81522f679ccdf38067e03102d2b64e44fc777204 /arch/x86/kernel | |
| parent | Merge branch 'x86-seccomp-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | x86/build: Add arch/x86/purgatory/ make generated files to gitignore (diff) | |
| download | kernel-qcow2-linux-2fd7476de999124bbf6830aa59ac092c882280fe.tar.gz kernel-qcow2-linux-2fd7476de999124bbf6830aa59ac092c882280fe.tar.xz kernel-qcow2-linux-2fd7476de999124bbf6830aa59ac092c882280fe.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc smaller fixes that missed the v3.17 cycle"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/build: Add arch/x86/purgatory/ make generated files to gitignore
x86: Fix section conflict for numachip
x86: Reject x32 executables if x32 ABI not supported
x86_64, entry: Filter RFLAGS.NT on entry from userspace
x86, boot, kaslr: Fix nuisance warning on 32-bit builds
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/apic/apic_numachip.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c index ae915391ebec..4128b5fcb559 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -32,7 +32,7 @@ static int numachip_system __read_mostly; -static const struct apic apic_numachip __read_mostly; +static const struct apic apic_numachip; static unsigned int get_apic_id(unsigned long x) { diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index ef58886ba61c..700f958652f8 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1184,7 +1184,7 @@ void syscall_init(void) /* Flags to clear on syscall */ wrmsrl(MSR_SYSCALL_MASK, X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF| - X86_EFLAGS_IOPL|X86_EFLAGS_AC); + X86_EFLAGS_IOPL|X86_EFLAGS_AC|X86_EFLAGS_NT); } /* |