Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba33ea81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 asm updates from Ingo Molnar:
 "This is another big update. Main changes are:

   - lots of x86 system call (and other traps/exceptions) entry code
     enhancements.  In particular the complex parts of the 64-bit entry
     code have been migrated to C code as well, and a number of dusty
     corners have been refreshed.  (Andy Lutomirski)

   - vDSO special mapping robustification and general cleanups (Andy
     Lutomirski)

   - cpufeature refactoring, cleanups and speedups (Borislav Petkov)

   - lots of other changes ..."

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)
  x86/cpufeature: Enable new AVX-512 features
  x86/entry/traps: Show unhandled signal for i386 in do_trap()
  x86/entry: Call enter_from_user_mode() with IRQs off
  x86/entry/32: Change INT80 to be an interrupt gate
  x86/entry: Improve system call entry comments
  x86/entry: Remove TIF_SINGLESTEP entry work
  x86/entry/32: Add and check a stack canary for the SYSENTER stack
  x86/entry/32: Simplify and fix up the SYSENTER stack #DB/NMI fixup
  x86/entry: Only allocate space for tss_struct::SYSENTER_stack if needed
  x86/entry: Vastly simplify SYSENTER TF (single-step) handling
  x86/entry/traps: Clear DR6 early in do_debug() and improve the comment
  x86/entry/traps: Clear TIF_BLOCKSTEP on all debug exceptions
  x86/entry/32: Restore FLAGS on SYSEXIT
  x86/entry/32: Filter NT and speed up AC filtering in SYSENTER
  x86/entry/compat: In SYSENTER, sink AC clearing below the existing FLAGS test
  selftests/x86: In syscall_nt, test NT|TF as well
  x86/asm-offsets: Remove PARAVIRT_enabled
  x86/entry/32: Introduce and use X86_BUG_ESPFIX instead of paravirt_enabled
  uprobes: __create_xol_area() must nullify xol_mapping.fault
  x86/cpufeature: Create a new synthetic cpu capability for machine check recovery
  ...
parents e23604ed d0500494

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	clearcpuid=BITNUM [X86]

			Disable CPUID feature X for the kernel. See

			arch/x86/include/asm/cpufeature.h for the valid bit

			arch/x86/include/asm/cpufeatures.h for the valid bit

			numbers. Note the Linux specific bits are not necessarily

			stable over kernel options, but the vendor specific

			ones should be.

Documentation/x86/x86_64/boot-options.txt

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ Machine check 
		threshold to 1. Enabling this may make memory predictive failure

		analysis less effective if the bios sets thresholds for memory

		errors since we will not see details for all errors.

   mce=recovery

		Force-enable recoverable machine check code paths



   nomce (for compatibility with i386): same as mce=off

arch/x86/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -338,16 +338,6 @@ config DEBUG_IMR_SELFTEST 


	  If unsure say N here.



config X86_DEBUG_STATIC_CPU_HAS

	bool "Debug alternatives"

	depends on DEBUG_KERNEL

	---help---

	  This option causes additional code to be generated which

	  fails if static_cpu_has() is used before alternatives have

	  run.



	  If unsure, say N.



config X86_DEBUG_FPU

	bool "Debug the x86 FPU code"

	depends on DEBUG_KERNEL

arch/x86/boot/cpuflags.h

+1 −1
Original line number Diff line number Diff line 
#ifndef BOOT_CPUFLAGS_H

#define BOOT_CPUFLAGS_H



#include <asm/cpufeature.h>

#include <asm/cpufeatures.h>

#include <asm/processor-flags.h>



struct cpu_features {

arch/x86/boot/mkcpustr.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#include "../include/asm/required-features.h"

#include "../include/asm/disabled-features.h"

#include "../include/asm/cpufeature.h"

#include "../include/asm/cpufeatures.h"

#include "../kernel/cpu/capflags.c"



int main(void)