20 files changed, 82 insertions, 51 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f70e3e3a9fa7..c3f880902d66 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 7ef18b01f0bc..2ad6301849a1 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -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
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 5b1979a45a1e..5fc8d0b3191d 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -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
+
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 30d54ed27e55..bbdacb398d48 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -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
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 021624c83583..cbaaf69bedb2 100644
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -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);
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 90f038af3adc..b2cc73768a9d 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -656,15 +656,16 @@ int_msg:
         .asciz "Unknown interrupt or fault at EIP %p %p %p\n"
 
 fault_msg:
-        .asciz                                                          \
-/* fault info: */       "BUG: Int %d: CR2 %p\n"                         \
-/* pusha regs: */       "     EDI %p  ESI %p  EBP %p  ESP %p\n"         \
-                        "     EBX %p  EDX %p  ECX %p  EAX %p\n"         \
-/* fault frame: */      "     err %p  EIP %p   CS %p  flg %p\n"         \
-                                                                        \
-                        "Stack: %p %p %p %p %p %p %p %p\n"              \
-                        "       %p %p %p %p %p %p %p %p\n"              \
-                        "       %p %p %p %p %p %p %p %p\n"
+/* fault info: */
+        .ascii "BUG: Int %d: CR2 %p\n"
+/* pusha regs: */
+        .ascii "     EDI %p  ESI %p  EBP %p  ESP %p\n"
+        .ascii "     EBX %p  EDX %p  ECX %p  EAX %p\n"
+/* fault frame: */
+        .ascii "     err %p  EIP %p   CS %p  flg %p\n"
+        .ascii "Stack: %p %p %p %p %p %p %p %p\n"
+        .ascii "       %p %p %p %p %p %p %p %p\n"
+        .asciz "       %p %p %p %p %p %p %p %p\n"
 
 #include "../../x86/xen/xen-head.S"
 
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 9007f9ea64ee..9b5cfcdfc426 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -137,9 +137,10 @@ static void hpet_reserve_platform_timers(unsigned long id)
         hd.hd_irq[0] = HPET_LEGACY_8254;
         hd.hd_irq[1] = HPET_LEGACY_RTC;
 
-        for (i = 2; i < nrtimers; timer++, i++)
+        for (i = 2; i < nrtimers; timer++, i++) {