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

Commit 046fd537 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal 



Conflicts:
	arch/x86/kernel/signal_64.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 70bb0896 4ab4ba32 fe47784b 8d7ccaa5

Documentation/kernel-parameters.txt

+6 −0
Original line number Original line 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.

	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

	noltlbs		[PPC] Do not use large page/tlb entries for kernel

			lowmem mapping on PPC40x.

			lowmem mapping on PPC40x.

arch/x86/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ config X86 
	select HAVE_FTRACE

	select HAVE_FTRACE

	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_ARCH_KGDB if !X86_VOYAGER

	select HAVE_ARCH_KGDB if !X86_VOYAGER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_GENERIC_DMA_COHERENT if X86_32

	select HAVE_GENERIC_DMA_COHERENT if X86_32

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_EFFICIENT_UNALIGNED_ACCESS
@@ -1643,6 +1644,14 @@ config DMAR_FLOPPY_WA 
	 workaround will setup a 1:1 mapping for the first

	 workaround will setup a 1:1 mapping for the first

	 16M to make floppy (an ISA device) work.

	 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/pcie/Kconfig"





source "drivers/pci/Kconfig"

source "drivers/pci/Kconfig"

arch/x86/Kconfig.cpu

+70 −0
Original line number Original line Diff line number Diff line
@@ -415,3 +415,73 @@ config X86_MINIMUM_CPU_FAMILY 
config X86_DEBUGCTLMSR

config X86_DEBUGCTLMSR

	def_bool y

	def_bool y

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)

	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 Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
 */

 */

#undef CONFIG_PARAVIRT

#undef CONFIG_PARAVIRT

#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

#define _ASM_DESC_H_ 1

#define ASM_X86__DESC_H 1

#endif

#endif





#ifdef CONFIG_X86_64

#ifdef CONFIG_X86_64

arch/x86/boot/cpucheck.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -38,12 +38,12 @@ static const u32 req_flags[NCAPINTS] = 
{

{

	REQUIRED_MASK0,

	REQUIRED_MASK0,

	REQUIRED_MASK1,

	REQUIRED_MASK1,

	REQUIRED_MASK2,

	0, /* REQUIRED_MASK2 not implemented in this file */

	REQUIRED_MASK3,

	0, /* REQUIRED_MASK3 not implemented in this file */

	REQUIRED_MASK4,

	REQUIRED_MASK4,

	REQUIRED_MASK5,

	0, /* REQUIRED_MASK5 not implemented in this file */

	REQUIRED_MASK6,

	REQUIRED_MASK6,

	REQUIRED_MASK7,

	0, /* REQUIRED_MASK7 not implemented in this file */

};

};





#define A32(a, b, c, d) (((d) << 24)+((c) << 16)+((b) << 8)+(a))

#define A32(a, b, c, d) (((d) << 24)+((c) << 16)+((b) << 8)+(a))