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

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Clean up arch/x86/Kconfig*
  x86-64: Don't export init_level4_pgt

diff --combined arch/x86/Kconfig
index 01177dcbe261e3e1639cd6abaf907f784c2f40ca,85e2252625bcb7974f102a984561e02ee6d1dbba..7b783887455207c896b01af7f0db65e7bf5ad848
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -53,15 -53,11 +53,15 @@@ config X8
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_LZO
        select HAVE_HW_BREAKPOINT
 +      select HAVE_MIXED_BREAKPOINTS_REGS
        select PERF_EVENTS
        select ANON_INODES
        select HAVE_ARCH_KMEMCHECK
        select HAVE_USER_RETURN_NOTIFIER
  
 +config INSTRUCTION_DECODER
 +      def_bool (KPROBES || PERF_EVENTS)
 +
  config OUTPUT_FORMAT
        string
        default "elf32-i386" if X86_32
@@@ -201,20 -197,17 +201,17 @@@ config HAVE_INTEL_TX
  
  # Use the generic interrupt handling code in kernel/irq/:
  config GENERIC_HARDIRQS
-       bool
-       default y
+       def_bool y
  
  config GENERIC_HARDIRQS_NO__DO_IRQ
         def_bool y
  
  config GENERIC_IRQ_PROBE
-       bool
-       default y
+       def_bool y
  
  config GENERIC_PENDING_IRQ
-       bool
+       def_bool y
        depends on GENERIC_HARDIRQS && SMP
-       default y
  
  config USE_GENERIC_SMP_HELPERS
        def_bool y
@@@ -229,14 -222,12 +226,12 @@@ config X86_64_SM
        depends on X86_64 && SMP
  
  config X86_HT
-       bool
+       def_bool y
        depends on SMP
-       default y
  
  config X86_TRAMPOLINE
-       bool
+       def_bool y
        depends on SMP || (64BIT && ACPI_SLEEP)
-       default y
  
  config X86_32_LAZY_GS
        def_bool y
@@@ -451,7 -442,7 +446,7 @@@ config X86_NUMA
          firmware with - send email to <[email protected]>.
  
  config X86_SUPPORTS_MEMORY_FAILURE
-       bool
+       def_bool y
        # MCE code calls memory_failure():
        depends on X86_MCE
        # On 32-bit this adds too big of NODES_SHIFT and we run out of page flags:
@@@ -459,7 -450,6 +454,6 @@@
        # On 32-bit SPARSEMEM adds too big of SECTIONS_WIDTH:
        depends on X86_64 || !SPARSEMEM
        select ARCH_SUPPORTS_MEMORY_FAILURE
-       default y
  
  config X86_VISWS
        bool "SGI 320/540 (Visual Workstation)"
@@@ -574,7 -564,6 +568,6 @@@ config PARAVIRT_SPINLOCK
  
  config PARAVIRT_CLOCK
        bool
-       default n
  
  endif
  
@@@ -753,7 -742,6 +746,6 @@@ config MAXSM
        bool "Configure Maximum number of SMP Processors and NUMA Nodes"
        depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
        select CPUMASK_OFFSTACK
-       default n
        ---help---
          Configure maximum number of CPUS and NUMA Nodes for this architecture.
          If unsure, say N.
@@@ -833,7 -821,6 +825,6 @@@ config X86_VISWS_API
  
  config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
        bool "Reroute for broken boot IRQs"
-       default n
        depends on X86_IO_APIC
        ---help---
          This option enables a workaround that fixes a source of
@@@ -880,9 -867,8 +871,8 @@@ config X86_MCE_AM
           the DRAM Error Threshold.
  
  config X86_ANCIENT_MCE
-       def_bool n
+       bool "Support for old Pentium 5 / WinChip machine checks"
        depends on X86_32 && X86_MCE
-       prompt "Support for old Pentium 5 / WinChip machine checks"
        ---help---
          Include support for machine check handling on old Pentium 5 or WinChip
          systems. These typically need to be enabled explicitely on the command
@@@ -890,8 -876,7 +880,7 @@@
  
  config X86_MCE_THRESHOLD
        depends on X86_MCE_AMD || X86_MCE_INTEL
-       bool
-       default y
+       def_bool y
  
  config X86_MCE_INJECT
        depends on X86_MCE
@@@ -1030,8 -1015,8 +1019,8 @@@ config X86_CPUI
  
  choice
        prompt "High Memory Support"
-       default HIGHMEM4G if !X86_NUMAQ
        default HIGHMEM64G if X86_NUMAQ
+       default HIGHMEM4G
        depends on X86_32
  
  config NOHIGHMEM
@@@ -1289,7 -1274,7 +1278,7 @@@ source "mm/Kconfig
  
  config HIGHPTE
        bool "Allocate 3rd-level pagetables from highmem"
-       depends on X86_32 && (HIGHMEM4G || HIGHMEM64G)
+       depends on HIGHMEM
        ---help---
          The VM uses one page table entry for each page of physical memory.
          For systems with a lot of RAM, this can be wasteful of precious
@@@ -1373,8 -1358,7 +1362,7 @@@ config MATH_EMULATIO
          kernel, it won't hurt.
  
  config MTRR
-       bool
-       default y
+       def_bool y
        prompt "MTRR (Memory Type Range Register) support" if EMBEDDED
        ---help---
          On Intel P6 family processors (Pentium Pro, Pentium II and later)
@@@ -1440,8 -1424,7 +1428,7 @@@ config MTRR_SANITIZER_SPARE_REG_NR_DEFA
          mtrr_spare_reg_nr=N on the kernel command line.
  
  config X86_PAT
-       bool
-       default y
+       def_bool y
        prompt "x86 PAT support" if EMBEDDED
        depends on MTRR
        ---help---
@@@ -1609,8 -1592,7 +1596,7 @@@ config X86_NEED_RELOC
        depends on X86_32 && RELOCATABLE
  
  config PHYSICAL_ALIGN
-       hex
-       prompt "Alignment value to which kernel should be aligned" if X86_32
+       hex "Alignment value to which kernel should be aligned" if X86_32
        default "0x1000000"
        range 0x2000 0x1000000
        ---help---
@@@ -1657,7 -1639,6 +1643,6 @@@ config COMPAT_VDS
  
  config CMDLINE_BOOL
        bool "Built-in kernel command line"
-       default n
        ---help---
          Allow for specifying boot arguments to the kernel at
          build time.  On some systems (e.g. embedded ones), it is
@@@ -1691,7 -1672,6 +1676,6 @@@ config CMDLIN
  
  config CMDLINE_OVERRIDE
        bool "Built-in command line overrides boot loader arguments"
-       default n
        depends on CMDLINE_BOOL
        ---help---
          Set this option to 'Y' to have the kernel ignore the boot loader
@@@ -1727,8 -1707,7 +1711,7 @@@ source "drivers/acpi/Kconfig
  source "drivers/sfi/Kconfig"
  
  config X86_APM_BOOT
-       bool
-       default y
+       def_bool y
        depends on APM || APM_MODULE
  
  menuconfig APM
@@@ -1957,8 -1936,7 +1940,7 @@@ config DMAR_DEFAULT_O
          experimental.
  
  config DMAR_BROKEN_GFX_WA
-       def_bool n
-       prompt "Workaround broken graphics drivers (going away soon)"
+       bool "Workaround broken graphics drivers (going away soon)"
        depends on DMAR && BROKEN
        ---help---
          Current Graphics drivers tend to use physical address
@@@ -2056,7 -2034,6 +2038,6 @@@ config SCx200HR_TIME
  config OLPC
        bool "One Laptop Per Child support"
        select GPIOLIB
-       default n
        ---help---
          Add support for detecting the unique features of the OLPC
          XO hardware.

diff --combined arch/x86/Kconfig.debug
index bd58c8abbfbddf3f5ceacc4267635e7f2e6c77c9,e7edd66d866e80fbc86dabc327575c1ff9ecae58..75085080b63e2f74d32d4fa2b4bd2f8972d2b7de
--- 1/arch/x86/Kconfig.debug
--- 2/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -45,7 -45,6 +45,6 @@@ config EARLY_PRINT
  
  config EARLY_PRINTK_DBGP
        bool "Early printk via EHCI debug port"
-       default n
        depends on EARLY_PRINTK && PCI
        ---help---
          Write kernel log output directly into the EHCI debug port.
@@@ -76,7 -75,6 +75,6 @@@ config DEBUG_PER_CPU_MAP
        bool "Debug access to per_cpu maps"
        depends on DEBUG_KERNEL
        depends on SMP
-       default n
        ---help---
          Say Y to verify that the per_cpu map being accessed has
          been setup.  Adds a fair amount of code to kernel memory
@@@ -174,6 -172,15 +172,6 @@@ config IOMMU_LEA
          Add a simple leak tracer to the IOMMU code. This is useful when you
          are debugging a buggy device driver that leaks IOMMU mappings.
  
 -config X86_DS_SELFTEST
 -    bool "DS selftest"
 -    default y
 -    depends on DEBUG_KERNEL
 -    depends on X86_DS
 -      ---help---
 -        Perform Debug Store selftests at boot time.
 -        If in doubt, say "N".
 -
  config HAVE_MMIOTRACE_SUPPORT
        def_bool y