Merge branch 'x86/core' into x86/unify-cpu-detect (0c8c708a) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/kernel-parameters.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -1425,6 +1425,12 @@ and is between 256 and 4096 characters. It is defined in the file

		nolapic_timer [X86-32,APIC] Do not use the local APIC timer.

		nox2apic [X86-64,APIC] Do not enable x2APIC mode.

		x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
		default x2apic cluster mode on platforms
		supporting x2apic.

		noltlbs [PPC] Do not use large page/tlb entries for kernel
		lowmem mapping on PPC40x.

		@@ -1882,6 +1888,12 @@ and is between 256 and 4096 characters. It is defined in the file
		shapers= [NET]
		Maximal number of shapers.

		show_msr= [x86] show boot-time MSR settings
		Format: { <integer> }
		Show boot-time (BIOS-initialized) MSR settings.
		The parameter means the number of CPUs to show,
		for example 1 means boot CPU only.

		sim710= [SCSI,HW]
		See header of drivers/scsi/sim710.c.

arch/um/sys-x86_64/syscall_table.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,12 +41,12 @@
		#define stub_rt_sigreturn sys_rt_sigreturn

		#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
		#undef _ASM_X86_64_UNISTD_H_
		#undef ASM_X86__UNISTD_64_H
		#include <asm-x86/unistd_64.h>

		#undef __SYSCALL
		#define __SYSCALL(nr, sym) [ nr ] = sym,
		#undef _ASM_X86_64_UNISTD_H_
		#undef ASM_X86__UNISTD_64_H

		typedef void (*sys_call_ptr_t)(void);

arch/x86/Kconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -1643,6 +1643,14 @@ config DMAR_FLOPPY_WA
		workaround will setup a 1:1 mapping for the first
		16M to make floppy (an ISA device) work.

		config INTR_REMAP
		bool "Support for Interrupt Remapping (EXPERIMENTAL)"
		depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
		help
		Supports Interrupt remapping for IO-APIC and MSI devices.
		To use x2apic mode in the CPU's which support x2APIC enhancements or
		to support platforms with CPU's having > 8 bit APIC ID, say Y.

		source "drivers/pci/pcie/Kconfig"

		source "drivers/pci/Kconfig"

arch/x86/Kconfig.cpu

+70 −0

Original line number	Diff line number	Diff line
		@@ -415,3 +415,73 @@ config X86_MINIMUM_CPU_FAMILY
		config X86_DEBUGCTLMSR
		def_bool y
		depends on !(MK6 \|\| MWINCHIPC6 \|\| MWINCHIP2 \|\| MWINCHIP3D \|\| MCYRIXIII \|\| M586MMX \|\| M586TSC \|\| M586 \|\| M486 \|\| M386)

		menuconfig PROCESSOR_SELECT
		default y
		bool "Supported processor vendors" if EMBEDDED
		help
		This lets you choose what x86 vendor support code your kernel
		will include.

		config CPU_SUP_INTEL_32
		default y
		bool "Support Intel processors" if PROCESSOR_SELECT
		depends on !64BIT
		help
		This enables extended support for Intel processors

		config CPU_SUP_INTEL_64
		default y
		bool "Support Intel processors" if PROCESSOR_SELECT
		depends on 64BIT
		help
		This enables extended support for Intel processors

		config CPU_SUP_CYRIX_32
		default y
		bool "Support Cyrix processors" if PROCESSOR_SELECT
		depends on !64BIT
		help
		This enables extended support for Cyrix processors

		config CPU_SUP_AMD_32
		default y
		bool "Support AMD processors" if PROCESSOR_SELECT
		depends on !64BIT
		help
		This enables extended support for AMD processors

		config CPU_SUP_AMD_64
		default y
		bool "Support AMD processors" if PROCESSOR_SELECT
		depends on 64BIT
		help
		This enables extended support for AMD processors

		config CPU_SUP_CENTAUR_32
		default y
		bool "Support Centaur processors" if PROCESSOR_SELECT
		depends on !64BIT
		help
		This enables extended support for Centaur processors

		config CPU_SUP_CENTAUR_64
		default y
		bool "Support Centaur processors" if PROCESSOR_SELECT
		depends on 64BIT
		help
		This enables extended support for Centaur processors

		config CPU_SUP_TRANSMETA_32
		default y
		bool "Support Transmeta processors" if PROCESSOR_SELECT
		depends on !64BIT
		help
		This enables extended support for Transmeta processors

		config CPU_SUP_UMC_32
		default y
		bool "Support UMC processors" if PROCESSOR_SELECT
		depends on !64BIT
		help
		This enables extended support for UMC processors

arch/x86/boot/compressed/misc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		*/
		#undef CONFIG_PARAVIRT
		#ifdef CONFIG_X86_32
		#define _ASM_DESC_H_ 1
		#define ASM_X86__DESC_H 1
		#endif

		#ifdef CONFIG_X86_64