Merge commit 'v2.6.27-rc6' into x86/cleanups

diff --combined arch/x86/Kconfig
index 4c1475119cef00213537e8ba47c074fa5dc58c00,ed92864d1325c09092f3e8ed4918f26341f23161..8e5e45a265d4ee80618395fb6665a53c4aac3f13
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -577,35 -577,29 +577,29 @@@ config SWIOTL
  
  config IOMMU_HELPER
        def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
+ 
  config MAXSMP
        bool "Configure Maximum number of SMP Processors and NUMA Nodes"
-       depends on X86_64 && SMP
+       depends on X86_64 && SMP && BROKEN
        default n
        help
          Configure maximum number of CPUS and NUMA Nodes for this architecture.
          If unsure, say N.
  
- if MAXSMP
- config NR_CPUS
-       int
-       default "4096"
- endif
- 
- if !MAXSMP
  config NR_CPUS
-       int "Maximum number of CPUs (2-4096)"
-       range 2 4096
+       int "Maximum number of CPUs (2-512)" if !MAXSMP
+       range 2 512
        depends on SMP
+       default "4096" if MAXSMP
        default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
        default "8"
        help
          This allows you to specify the maximum number of CPUs which this
-         kernel will support.  The maximum supported value is 4096 and the
+         kernel will support.  The maximum supported value is 512 and the
          minimum value which makes sense is 2.
  
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
- endif
  
  config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
@@@ -996,17 -990,10 +990,10 @@@ config NUMA_EM
          into virtual nodes when booted with "numa=fake=N", where N is the
          number of nodes. This is only useful for debugging.
  
- if MAXSMP
- 
  config NODES_SHIFT
-       int
-       default "9"
- endif
- 
- if !MAXSMP
- config NODES_SHIFT
-       int "Maximum NUMA Nodes (as a power of 2)"
+       int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP
        range 1 9   if X86_64
+       default "9" if MAXSMP
        default "6" if X86_64
        default "4" if X86_NUMAQ
        default "3"
@@@ -1014,7 -1001,6 +1001,6 @@@
        help
          Specify the maximum number of NUMA Nodes available on the target
          system.  Increases memory reserved to accomodate various tables.
- endif
  
  config HAVE_ARCH_BOOTMEM_NODE
        def_bool y
@@@ -1205,6 -1191,7 +1191,6 @@@ config IRQBALANC
  config SECCOMP
        def_bool y
        prompt "Enable seccomp to safely compute untrusted bytecode"
 -      depends on PROC_FS
        help
          This kernel feature is useful for number crunching applications
          that may need to compute untrusted bytecode during their
@@@ -1212,7 -1199,7 +1198,7 @@@
          the process as file descriptors supporting the read/write
          syscalls, it's possible to isolate those applications in
          their own address space using seccomp. Once seccomp is
 -        enabled via /proc/<pid>/seccomp, it cannot be disabled
 +        enabled via prctl(PR_SET_SECCOMP), it cannot be disabled
          and the task is only allowed to execute a few safe syscalls
          defined by each seccomp mode.
  
@@@ -1786,7 -1773,7 +1772,7 @@@ config COMPAT_FOR_U64_ALIGNMEN
  
  config SYSVIPC_COMPAT
        def_bool y
 -      depends on X86_64 && COMPAT && SYSVIPC
 +      depends on COMPAT && SYSVIPC
  
  endmenu