Commit 958a2f29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3: (21 commits)
  x86: numaq fix
  x86: 8K stacks by default
  x86: ioremap ram check fix
  x86: fix HT cpu booting on 32-bit
  x86: optimize inlining off
  x86: CONFIG_X86_ELAN fix
  x86: Kconfig fix
  x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()
  x86: use defconfigs from x86/configs/*
  toshiba: use ioremap_cached
  revert: "x86: ioremap(), extend check to all RAM pages"
  x86: don't bother printing compat vdso address
  fix: x86: support for new UV apic
  x86: fix early-BUG message
  x86: iommu_sac_force can become static
  x86: add proper header for reboot_force
  x86 VISWS: build fix
  x86, voyager: fix ioremap_nocache()
  hpet: fix
  x86: unexport kmap_atomic_to_page
  ...
parents 6de3d58d 895d3093

arch/x86/Kconfig

+14 −2
Original line number Diff line number Diff line
@@ -25,6 +25,18 @@ config X86 
	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_ARCH_KGDB if !X86_VOYAGER



config DEFCONFIG_LIST

	string

	depends on X86_32

	option defconfig_list

	default "arch/x86/configs/i386_defconfig"



config DEFCONFIG_LIST

	string

	depends on X86_64

	option defconfig_list

	default "arch/x86/configs/x86_64_defconfig"





config GENERIC_LOCKBREAK

	def_bool n
@@ -180,7 +192,7 @@ config X86_HT 


config X86_BIOS_REBOOT

	bool

	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)

	depends on !X86_VISWS && !X86_VOYAGER

	default y



config X86_TRAMPOLINE
@@ -1161,7 +1173,7 @@ source kernel/Kconfig.hz 


config KEXEC

	bool "kexec system call"

	depends on X86_64 || X86_BIOS_REBOOT

	depends on X86_BIOS_REBOOT

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

arch/x86/Kconfig.cpu

+5 −5
Original line number Diff line number Diff line
@@ -278,11 +278,6 @@ config GENERIC_CPU 


endchoice



config X86_CPU

	def_bool y

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_FIND_NEXT_BIT



config X86_GENERIC

	bool "Generic x86 support"

	depends on X86_32
@@ -297,6 +292,11 @@ config X86_GENERIC 


endif



config X86_CPU

	def_bool y

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_FIND_NEXT_BIT



#

# Define implied options from the CPU selection here

config X86_L1_CACHE_BYTES

arch/x86/Kconfig.debug

+3 −4
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ config DEBUG_NX_TEST 
config 4KSTACKS

	bool "Use 4Kb for kernel stacks instead of 8Kb"

	depends on X86_32

	default y

	help

	  If you say Y here the kernel will use a 4Kb stacksize for the

	  kernel stack attached to each process/thread. This facilitates
@@ -256,11 +255,8 @@ config CPA_DEBUG 
	help

	  Do change_page_attr() self-tests every 30 seconds.



endmenu



config OPTIMIZE_INLINING

	bool "Allow gcc to uninline functions marked 'inline'"

	default y

	help

	  This option determines if the kernel forces gcc to inline the functions

	  developers have marked 'inline'. Doing so takes away freedom from gcc to
@@ -270,3 +266,6 @@ config OPTIMIZE_INLINING 
	  this algorithm is so good that allowing gcc4 to make the decision can

	  become the default in the future, until then this option is there to

	  test gcc for this.



endmenu

arch/x86/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o 
obj-y				+= cpu/

obj-y				+= acpi/

obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o

obj-$(CONFIG_X86_64)		+= reboot.o

obj-$(CONFIG_MCA)		+= mca_32.o

obj-$(CONFIG_X86_MSR)		+= msr.o

obj-$(CONFIG_X86_CPUID)		+= cpuid.o

arch/x86/kernel/genapic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ unsigned int read_apic_id(void) 
{

	unsigned int id;



	WARN_ON(preemptible());

	WARN_ON(preemptible() && num_online_cpus() > 1);

	id = apic_read(APIC_ID);

	if (uv_system_type >= UV_X2APIC)

		id  |= __get_cpu_var(x2apic_extra_bits);

CRA Git | Maintained and supported by SUSTech CRA and CCSE