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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
  x86: standalone trampoline code
  x86: move suspend wakeup code to C
  x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
  x86: setup_trampoline() - fix section mismatch warning
  x86: section mismatch fixes, #1
  x86: fix paranoia about using BIOS quickboot mechanism.
  x86: print out buggy mptable
  x86: use cpu_online()
  x86: use cpumask_of_cpu()
  x86: remove unnecessary tmp local variable
  x86: remove unnecessary memset()
  x86: use ioapic_read_entry() and ioapic_write_entry()
  x86: avoid redundant loop in io_apic_level_ack_pending()
  x86: remove superfluous initialisation in boot code.
  x86: merge mpparse_{32,64}.c
  x86: unify mp_register_gsi
  x86: unify mp_config_acpi_legacy_irqs
  x86: unify mp_register_ioapic
  x86: unify uniq_io_apic_id
  x86: unify smp_scan_config
  ...

diff --combined arch/x86/Kconfig
index e4b38861ea523c55143cf237588113977bedda47,4e32b6f7d31a5202f7cdec9182cec905b27bc48a..701c4a27a731a601fee4d0a07cb47ac5beb63411
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -53,6 -53,9 +53,6 @@@ config STACKTRACE_SUPPOR
  config HAVE_LATENCYTOP_SUPPORT
        def_bool y
  
 -config SEMAPHORE_SLEEPERS
 -      def_bool y
 -
  config FAST_CMPXCHG_LOCAL
        bool
        default y
@@@ -114,7 -117,7 +114,7 @@@ config ARCH_HAS_CPU_RELA
        def_bool y
  
  config HAVE_SETUP_PER_CPU_AREA
-       def_bool X86_64
+       def_bool X86_64 || (X86_SMP && !X86_VOYAGER)
  
  config ARCH_HIBERNATION_POSSIBLE
        def_bool y
@@@ -168,7 -171,7 +168,7 @@@ config X86_64_SM
  config X86_HT
        bool
        depends on SMP
-       depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8)
+       depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || X86_64
        default y
  
  config X86_BIOS_REBOOT
@@@ -178,7 -181,7 +178,7 @@@
  
  config X86_TRAMPOLINE
        bool
-       depends on X86_SMP || (X86_VOYAGER && SMP)
+       depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP)
        default y
  
  config KTIME_SCALAR
@@@ -238,8 -241,7 +238,7 @@@ config X86_ELA
  
  config X86_VOYAGER
        bool "Voyager (NCR)"
-       depends on X86_32
-       select SMP if !BROKEN
+       depends on X86_32 && (SMP || BROKEN)
        help
          Voyager is an MCA-based 32-way capable SMP architecture proprietary
          to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@@ -251,9 -253,8 +250,8 @@@
  
  config X86_NUMAQ
        bool "NUMAQ (IBM/Sequent)"
-       select SMP
+       depends on SMP && X86_32
        select NUMA
-       depends on X86_32
        help
          This option is used for getting Linux to run on a (IBM/Sequent) NUMA
          multiquad box. This changes the way that processors are bootstrapped,
@@@ -324,8 -325,9 +322,9 @@@ config X86_RDC321
  
  config X86_VSMP
        bool "Support for ScaleMP vSMP"
-       depends on X86_64 && PCI
-        help
+       select PARAVIRT
+       depends on X86_64
+       help
          Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
          supposed to run on these EM64T-based machines.  Only choose this option
          if you have one of these machines.
@@@ -380,6 -382,35 +379,35 @@@ config PARAVIR
  
  endif
  
+ config MEMTEST_BOOTPARAM
+       bool "Memtest boot parameter"
+       depends on X86_64
+       default y
+       help
+         This option adds a kernel parameter 'memtest', which allows memtest
+         to be disabled at boot.  If this option is selected, memtest
+         functionality can be disabled with memtest=0 on the kernel
+         command line.  The purpose of this option is to allow a single
+         kernel image to be distributed with memtest built in, but not
+         necessarily enabled.
+ 
+         If you are unsure how to answer this question, answer Y.
+ 
+ config MEMTEST_BOOTPARAM_VALUE
+       int "Memtest boot parameter default value (0-4)"
+       depends on MEMTEST_BOOTPARAM
+       range 0 4
+       default 0
+       help
+         This option sets the default value for the kernel parameter
+         'memtest', which allows memtest to be disabled at boot.  If this
+         option is set to 0 (zero), the memtest kernel parameter will
+         default to 0, disabling memtest at bootup.  If this option is
+         set to 4, the memtest kernel parameter will default to 4,
+         enabling memtest at bootup, and use that as pattern number.
+ 
+         If you are unsure how to answer this question, answer 0.
+ 
  config ACPI_SRAT
        def_bool y
        depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
@@@ -504,7 -535,7 +532,7 @@@ config NR_CPU
  
  config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
-       depends on (X86_64 && SMP) || (X86_32 && X86_HT)
+       depends on X86_HT
        help
          SMT scheduler support improves the CPU scheduler's decision making
          when dealing with Intel Pentium 4 chips with HyperThreading at a
@@@ -514,7 -545,7 +542,7 @@@
  config SCHED_MC
        def_bool y
        prompt "Multi-core scheduler support"
-       depends on (X86_64 && SMP) || (X86_32 && X86_HT)
+       depends on X86_HT
        help
          Multi-core scheduler support improves the CPU scheduler's decision
          making when dealing with multi-core CPU chips at a cost of slightly
@@@ -883,7 -914,7 +911,7 @@@ config NUMA_EM
          number of nodes. This is only useful for debugging.
  
  config NODES_SHIFT
-       int
+       int "Max num nodes shift(1-15)"
        range 1 15  if X86_64
        default "6" if X86_64
        default "4" if X86_NUMAQ
@@@ -1007,6 -1038,21 +1035,21 @@@ config MTR
  
          See <file:Documentation/mtrr.txt> for more information.
  
+ config X86_PAT
+       def_bool y
+       prompt "x86 PAT support"
+       depends on MTRR && NONPROMISC_DEVMEM
+       help
+         Use PAT attributes to setup page level cache control.
+ 
+         PATs are the modern equivalents of MTRRs and are much more
+         flexible than MTRRs.
+ 
+         Say N here if you see bootup problems (boot crash, boot hang,
+         spontaneous reboots) or a non-working video driver.
+ 
+         If unsure, say Y.
+ 
  config EFI
        def_bool n
        prompt "EFI runtime service support"
@@@ -1075,6 -1121,7 +1118,7 @@@ source kernel/Kconfig.h
  
  config KEXEC
        bool "kexec system call"
+       depends on X86_64 || 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
@@@ -1376,7 -1423,7 +1420,7 @@@ endmen
  menu "Bus options (PCI etc.)"
  
  config PCI
-       bool "PCI support" if !X86_VISWS
+       bool "PCI support" if !X86_VISWS && !X86_VSMP
        depends on !X86_VOYAGER
        default y
        select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)

diff --combined arch/x86/kernel/x8664_ksyms_64.c
index 95a993e18165d14bd3747923b6dadf1f2d4f8614,e63d96823a168916aa821a8db0ecae6c4002c82d..58882f9f2637b03c0647f52b5e0901ab2deac582
--- 1/arch/x86/kernel/x8664_ksyms_64.c
--- 2/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@@ -4,6 -4,7 +4,6 @@@
  #include <linux/module.h>
  #include <linux/smp.h>
  
 -#include <asm/semaphore.h>
  #include <asm/processor.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
@@@ -11,6 -12,11 +11,6 @@@
  
  EXPORT_SYMBOL(kernel_thread);
  
 -EXPORT_SYMBOL(__down_failed);
 -EXPORT_SYMBOL(__down_failed_interruptible);
 -EXPORT_SYMBOL(__down_failed_trylock);
 -EXPORT_SYMBOL(__up_wakeup);
 -
  EXPORT_SYMBOL(__get_user_1);
  EXPORT_SYMBOL(__get_user_2);
  EXPORT_SYMBOL(__get_user_4);
@@@ -29,15 -35,17 +29,17 @@@ EXPORT_SYMBOL(__copy_from_user_inatomic
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
  
- /* Export string functions. We normally rely on gcc builtin for most of these,
-    but gcc sometimes decides not to inline them. */    
+ /*
+  * Export string functions. We normally rely on gcc builtin for most of these,
+  * but gcc sometimes decides not to inline them.
+  */
  #undef memcpy
  #undef memset
  #undef memmove
  
- extern void * memset(void *,int,__kernel_size_t);
- extern void * memcpy(void *,const void *,__kernel_size_t);
- extern void * __memcpy(void *,const void *,__kernel_size_t);
+ extern void *memset(void *, int, __kernel_size_t);
+ extern void *memcpy(void *, const void *, __kernel_size_t);
+ extern void *__memcpy(void *, const void *, __kernel_size_t);
  
  EXPORT_SYMBOL(memset);
  EXPORT_SYMBOL(memcpy);