Commit 1fe3f29e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/fpu', 'x86/mm' and 'x86/asm' into x86/pkeys 



Provide a stable basis for the pkeys patches, which touches various
x86 details.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1926e54f 58122bf1 e2c7698c f2cc8e07

Documentation/kernel-parameters.txt

+3 −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.
@@ -2566,6 +2566,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	nointroute	[IA-64]



	noinvpcid	[X86] Disable the INVPCID cpu feature.



	nojitter	[IA-64] Disables jitter checking for ITC timers.



	no-kvmclock	[X86,KVM] Disable paravirtualized KVM clock driver

arch/x86/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -350,16 +350,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)

arch/x86/crypto/crc32-pclmul_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/crc32.h>

#include <crypto/internal/hash.h>



#include <asm/cpufeature.h>

#include <asm/cpufeatures.h>

#include <asm/cpu_device_id.h>

#include <asm/fpu/api.h>