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

Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of... 

Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-v28-for-linus-phase4-D' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (186 commits)
  x86, debug: print more information about unknown CPUs
  x86 setup: handle more than 8 CPU flag words
  x86: cpuid, fix typo
  x86: move transmeta cap read to early_init_transmeta()
  x86: identify_cpu_without_cpuid v2
  x86: extended "flags" to show virtualization HW feature in /proc/cpuinfo
  x86: move VMX MSRs to msr-index.h
  x86: centaur_64.c remove duplicated setting of CONSTANT_TSC
  x86: intel.c put workaround for old cpus together
  x86: let intel 64-bit use intel.c
  x86: make intel_64.c the same as intel.c
  x86: make intel.c have 64-bit support code
  x86: little clean up of intel.c/intel_64.c
  x86: make 64 bit to use amd.c
  x86: make amd_64 have 32 bit code
  x86: make amd.c have 64bit support code
  x86: merge header in amd_64.c
  x86: add srat_detect_node for amd64
  x86: remove duplicated force_mwait
  x86: cpu make amd.c more like amd_64.c v2
  ...
parents bf6f51e3 0afe2db2

Documentation/kernel-parameters.txt

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

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
@@ -1689,6 +1689,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

+54 −0
Original line number Diff line number Diff line
@@ -419,6 +419,60 @@ 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

	default y

	bool "Support Intel processors" if PROCESSOR_SELECT

	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

	default y

	bool "Support AMD processors" if PROCESSOR_SELECT

	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



config X86_DS

	bool "Debug Store support"

	default y

arch/x86/boot/cpu.c

+9 −8
Original line number Diff line number Diff line
@@ -59,17 +59,18 @@ int validate_cpu(void) 
			u32 e = err_flags[i];



			for (j = 0; j < 32; j++) {

				int n = (i << 5)+j;

				if (*msg_strs < n) {

				if (msg_strs[0] < i ||

				    (msg_strs[0] == i && msg_strs[1] < j)) {

					/* Skip to the next string */

					do {

						msg_strs++;

					} while (*msg_strs);

					msg_strs++;

					msg_strs += 2;

					while (*msg_strs++)

						;

				}

				if (e & 1) {

					if (*msg_strs == n && msg_strs[1])

						printf("%s ", msg_strs+1);

					if (msg_strs[0] == i &&

					    msg_strs[1] == j &&

					    msg_strs[2])

						printf("%s ", msg_strs+2);

					else

						printf("%d:%d ", i, j);

				}

CRA Git | Maintained and supported by SUSTech CRA and CCSE