Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86: x86: enable "make ARCH=x86" x86: do not use $(ARCH) when not needed kconfig: use $K64BIT to set 64BIT with all*config targets kconfig: add helper to set config symbol from environment variable kconfig: factor out code in confdata.c x86: move the rest of the menu's to Kconfig x86: move all simple arch settings to Kconfig x86: copy x86_64 specific Kconfig symbols to Kconfig.i386 x86: add X86_64 dependency to x86_64 specific symbols in Kconfig.x86_64 x86: add X86_32 dependency to i386 specific symbols in Kconfig.i386 x86: arch/x86/Kconfig.cpu unification x86: start unification of arch/x86/Kconfig.* x86: unification of cfufreq/Kconfig
2024-09-13 14:14:37 +00:00 · 2007-11-14 18:53:11 -08:00 · 2007-11-14 18:53:11 -08:00 · a052f44736
commit a052f44736
parent 6f37ac793d daa93fab82
19 changed files with 682 additions and 1233 deletions
--- a/13
+++ b/13
@ -197,8 +197,15 @@ CROSS_COMPILE	?=
 UTS_MACHINE 	:= $(ARCH)
 SRCARCH 	:= $(ARCH)
-# for i386 and x86_64 we use SRCARCH equal to x86
+# Additional ARCH settings for x86
-SRCARCH := $(if $(filter x86_64 i386,$(SRCARCH)),x86,$(SRCARCH))
+ifeq ($(ARCH),i386)
        SRCARCH := x86
        K64BIT  := n
 endif
 ifeq ($(ARCH),x86_64)
        SRCARCH := x86
        K64BIT  := y
 endif
 KCONFIG_CONFIG	?= .config
@ -334,7 +341,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
 KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
-export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
+export ARCH SRCARCH K64BIT CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
 export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
 export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
--- a/2
+++ b/2
@ -194,6 +194,8 @@ CONFIGURING the kernel:
   "make *config" checks for a file named "all{yes/mod/no/random}.config"
   for symbol values that are to be forced.  If this file is not found,
   it checks for a file named "all.config" to contain forced values.
   Finally it checks the environment variable K64BIT and if found, sets
   the config symbol "64BIT" to the value of the K64BIT variable.
 	NOTES on "make config":
 	- having unnecessary drivers will make the kernel bigger, and can
--- a/arch/x86/Kconfig.i386
+++ b/arch/x86/Kconfig.i386
@ -1,18 +1,24 @@
-#
+# x86 configuration
-# For a description of the syntax of this configuration file,
+mainmenu "Linux Kernel Configuration for x86"
 # see Documentation/kbuild/kconfig-language.txt.
 #
-mainmenu "Linux Kernel Configuration"
+# Select 32 or 64 bit
 config 64BIT
 	bool "64-bit kernel"
 	default n
 	help
 	  Say yes to build a 64-bit kernel - formerly known as x86_64
 	  Say no to build a 32-bit kernel - formerly known as i386
 config X86_32
 	def_bool !64BIT
 config X86_64
 	def_bool 64BIT
 ### Arch settings
 config X86
 	bool
 	default y
 	help
 	  This is Linux's home port.  Linux was originally native to the Intel
 	  386, and runs on all the later x86 processors including the Intel
 	  486, 586, Pentiums, and various instruction-set-compatible chips by
 	  AMD, Cyrix, and others.
 config GENERIC_TIME
 	bool
@ -33,7 +39,7 @@ config GENERIC_CLOCKEVENTS
 config GENERIC_CLOCKEVENTS_BROADCAST
 	bool
 	default y
-	depends on X86_LOCAL_APIC
+	depends on X86_64 || (X86_32 && X86_LOCAL_APIC)
 config LOCKDEP_SUPPORT
 	bool
@ -47,10 +53,6 @@ config SEMAPHORE_SLEEPERS
 	bool
 	default y
 config X86
 	bool
 	default y
 config MMU
 	bool
 	default y
@ -61,7 +63,7 @@ config ZONE_DMA
 config QUICKLIST
 	bool
-	default y
+	default X86_32
 config SBUS
 	bool
@ -91,6 +93,76 @@ config DMI
 	bool
 	default y
 config RWSEM_GENERIC_SPINLOCK
 	def_bool !X86_XADD
 config RWSEM_XCHGADD_ALGORITHM
 	def_bool X86_XADD
 config ARCH_HAS_ILOG2_U32
 	def_bool n
 config ARCH_HAS_ILOG2_U64
 	def_bool n
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 config GENERIC_TIME_VSYSCALL
 	bool
 	default X86_64
 config ZONE_DMA32
 	bool
 	default X86_64
 config ARCH_POPULATES_NODE_MAP
 	def_bool y
 config AUDIT_ARCH
 	bool
 	default X86_64
 # Use the generic interrupt handling code in kernel/irq/:
 config GENERIC_HARDIRQS
 	bool
 	default y
 config GENERIC_IRQ_PROBE
 	bool
 	default y
 config GENERIC_PENDING_IRQ
 	bool
 	depends on GENERIC_HARDIRQS && SMP
 	default y
 config X86_SMP
 	bool
 	depends on X86_32 && SMP && !X86_VOYAGER
 	default y
 config X86_HT
 	bool
 	depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
 	default y
 config X86_BIOS_REBOOT
 	bool
 	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
 	default y
 config X86_TRAMPOLINE
 	bool
 	depends on X86_SMP || (X86_VOYAGER && SMP)
 	default y
 config KTIME_SCALAR
 	def_bool X86_32
 source "init/Kconfig"
 menu "Processor type and features"
@ -137,6 +209,7 @@ config X86_PC
 config X86_ELAN
 	bool "AMD Elan"
 	depends on X86_32
 	help
 	  Select this for an AMD Elan processor.
@ -146,6 +219,7 @@ config X86_ELAN
 config X86_VOYAGER
 	bool "Voyager (NCR)"
 	depends on X86_32
 	select SMP if !BROKEN
 	help
 	  Voyager is an MCA-based 32-way capable SMP architecture proprietary
@ -160,6 +234,7 @@ config X86_NUMAQ
 	bool "NUMAQ (IBM/Sequent)"
 	select SMP
 	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,
@ -169,7 +244,7 @@ config X86_NUMAQ
 config X86_SUMMIT
 	bool "Summit/EXA (IBM x440)"
-	depends on SMP
+	depends on X86_32 && SMP
 	help
 	  This option is needed for IBM systems that use the Summit/EXA chipset.
 	  In particular, it is needed for the x440.
@ -179,7 +254,7 @@ config X86_SUMMIT
 config X86_BIGSMP
 	bool "Support for other sub-arch SMP systems with more than 8 CPUs"
-	depends on SMP
+	depends on X86_32 && SMP
 	help
 	  This option is needed for the systems that have more than 8 CPUs
 	  and if the system is not of any sub-arch type above.
@ -188,6 +263,7 @@ config X86_BIGSMP
 config X86_VISWS
 	bool "SGI 320/540 (Visual Workstation)"
 	depends on X86_32
 	help
 	  The SGI Visual Workstation series is an IA32-based workstation
 	  based on SGI systems chips with some legacy PC hardware attached.
@ -199,6 +275,7 @@ config X86_VISWS
 config X86_GENERICARCH
       bool "Generic architecture (Summit, bigsmp, ES7000, default)"
 	depends on X86_32
       help
          This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
 	  It is intended for a generic binary kernel.
@ -206,18 +283,27 @@ config X86_GENERICARCH
 config X86_ES7000
 	bool "Support for Unisys ES7000 IA32 series"
-	depends on SMP
+	depends on X86_32 && SMP
 	help
 	  Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
 	  supposed to run on an IA32-based Unisys ES7000 system.
 	  Only choose this option if you have such a system, otherwise you
 	  should say N here.
 config X86_VSMP
 	bool "Support for ScaleMP vSMP"
 	depends on X86_64 && PCI
 	 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.
 endchoice
 config SCHED_NO_NO_OMIT_FRAME_POINTER
 	bool "Single-depth WCHAN output"
 	default y
 	depends on X86_32
 	help
 	  Calculate simpler /proc/<PID>/wchan values. If this option
 	  is disabled then wchan values will recurse back to the
@ -228,7 +314,7 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
 config PARAVIRT
 	bool
-	depends on !(X86_VISWS || X86_VOYAGER)
+	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
 	help
 	  This changes the kernel so it can modify itself when it is run
 	  under a hypervisor, potentially improving performance significantly
@ -237,6 +323,7 @@ config PARAVIRT
 menuconfig PARAVIRT_GUEST
 	bool "Paravirtualized guest support"
 	depends on X86_32
 	help
 	  Say Y here to get to see options related to running Linux under
 	  various hypervisors.  This option alone does not add any kernel code.
@ -264,7 +351,7 @@ endif
 config ACPI_SRAT
 	bool
 	default y
-	depends on ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
+	depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
 	select ACPI_NUMA
 config HAVE_ARCH_PARSE_SRAT
@ -275,12 +362,12 @@ config HAVE_ARCH_PARSE_SRAT
 config X86_SUMMIT_NUMA
 	bool
 	default y
-	depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)
+	depends on X86_32 && NUMA && (X86_SUMMIT || X86_GENERICARCH)
 config X86_CYCLONE_TIMER
 	bool
 	default y
-	depends on X86_SUMMIT || X86_GENERICARCH
+	depends on X86_32 && X86_SUMMIT || X86_GENERICARCH
 config ES7000_CLUSTERED_APIC
 	bool
@ -290,21 +377,89 @@ config ES7000_CLUSTERED_APIC
 source "arch/x86/Kconfig.cpu"
 config HPET_TIMER
-	bool "HPET Timer Support"
+	bool
 	prompt "HPET Timer Support" if X86_32
 	default X86_64
 	help
-	  This enables the use of the HPET for the kernel's internal timer.
+         Use the IA-PC HPET (High Precision Event Timer) to manage
-	  HPET is the next generation timer replacing legacy 8254s.
+         time in preference to the PIT and RTC, if a HPET is
-	  You can safely choose Y here.  However, HPET will only be
+         present.
-	  activated if the platform and the BIOS support this feature.
+         HPET is the next generation timer replacing legacy 8254s.
-	  Otherwise the 8254 will be used for timing services.
+         The HPET provides a stable time base on SMP
         systems, unlike the TSC, but it is more expensive to access,
         as it is off-chip.  You can find the HPET spec at
         <http://www.intel.com/hardwaredesign/hpetspec.htm>.
-	  Choose N to continue using the legacy 8254 timer.
+         You can safely choose Y here.  However, HPET will only be
         activated if the platform and the BIOS support this feature.
         Otherwise the 8254 will be used for timing services.
         Choose N to continue using the legacy 8254 timer.
 config HPET_EMULATE_RTC
 	bool
 	depends on HPET_TIMER && RTC=y
 	default y
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
 config GART_IOMMU
 	bool "GART IOMMU support" if EMBEDDED
 	default y
 	select SWIOTLB
 	select AGP
 	depends on X86_64 && PCI
 	help
 	  Support for full DMA access of devices with 32bit memory access only
 	  on systems with more than 3GB. This is usually needed for USB,
 	  sound, many IDE/SATA chipsets and some other devices.
 	  Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART
 	  based hardware IOMMU and a software bounce buffer based IOMMU used
 	  on Intel systems and as fallback.
 	  The code is only active when needed (enough memory and limited
 	  device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified
 	  too.
 config CALGARY_IOMMU
 	bool "IBM Calgary IOMMU support"
 	select SWIOTLB
 	depends on X86_64 && PCI && EXPERIMENTAL
 	help
 	  Support for hardware IOMMUs in IBM's xSeries x366 and x460
 	  systems. Needed to run systems with more than 3GB of memory
 	  properly with 32-bit PCI devices that do not support DAC
 	  (Double Address Cycle). Calgary also supports bus level
 	  isolation, where all DMAs pass through the IOMMU.  This
 	  prevents them from going anywhere except their intended
 	  destination. This catches hard-to-find kernel bugs and
 	  mis-behaving drivers and devices that do not use the DMA-API
 	  properly to set up their DMA buffers.  The IOMMU can be
 	  turned off at boot time with the iommu=off parameter.
 	  Normally the kernel will make the right choice by itself.
 	  If unsure, say Y.
 config CALGARY_IOMMU_ENABLED_BY_DEFAULT
 	bool "Should Calgary be enabled by default?"
 	default y
 	depends on CALGARY_IOMMU
 	help
 	  Should Calgary be enabled by default? if you choose 'y', Calgary
 	  will be used (if it exists). If you choose 'n', Calgary will not be
 	  used even if it exists. If you choose 'n' and would like to use
 	  Calgary anyway, pass 'iommu=calgary' on the kernel command line.
 	  If unsure, say Y.
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
 	bool
 	help
 	  Support for software bounce buffers used on x86-64 systems
 	  which don't have a hardware IOMMU (e.g. the current generation
 	  of Intel's x86-64 CPUs). Using this PCI devices which can only
 	  access 32-bits of memory can be used on systems with more than
 	  3 GB of memory. If unsure, say Y.
 config NR_CPUS
 	int "Maximum number of CPUs (2-255)"
 	range 2 255
@ -321,7 +476,7 @@ config NR_CPUS
 config SCHED_SMT
 	bool "SMT (Hyperthreading) scheduler support"
-	depends on X86_HT
+	depends on (X86_64 && SMP) || (X86_32 && X86_HT)
 	help
 	  SMT scheduler support improves the CPU scheduler's decision making
 	  when dealing with Intel Pentium 4 chips with HyperThreading at a
@ -330,7 +485,7 @@ config SCHED_SMT
 config SCHED_MC
 	bool "Multi-core scheduler support"
-	depends on X86_HT
+	depends on (X86_64 && SMP) || (X86_32 && X86_HT)
 	default y
 	help
 	  Multi-core scheduler support improves the CPU scheduler's decision
@ -341,7 +496,7 @@ source "kernel/Kconfig.preempt"
 config X86_UP_APIC
 	bool "Local APIC support on uniprocessors"
-	depends on !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH)
+	depends on X86_32 && !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH)
 	help
 	  A local APIC (Advanced Programmable Interrupt Controller) is an
 	  integrated interrupt controller in the CPU. If you have a single-CPU
@ -366,17 +521,17 @@ config X86_UP_IOAPIC
 config X86_LOCAL_APIC
 	bool
-	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) || X86_GENERICARCH
+	depends on X86_64 || (X86_32 && (X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) || X86_GENERICARCH))
 	default y
 config X86_IO_APIC
 	bool
-	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) || X86_GENERICARCH
+	depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) || X86_GENERICARCH))
 	default y
 config X86_VISWS_APIC
 	bool
-	depends on X86_VISWS
+	depends on X86_32 && X86_VISWS
 	default y
 config X86_MCE
@ -396,9 +551,25 @@ config X86_MCE
 	  to disable it.  MCE support simply ignores non-MCE processors like
 	  the 386 and 486, so nearly everyone can say Y here.
 config X86_MCE_INTEL
 	bool "Intel MCE features"
 	depends on X86_64 && X86_MCE && X86_LOCAL_APIC
 	default y
 	help
 	   Additional support for intel specific MCE features such as
 	   the thermal monitor.
 config X86_MCE_AMD
 	bool "AMD MCE features"
 	depends on X86_64 && X86_MCE && X86_LOCAL_APIC
 	default y
 	help
 	   Additional support for AMD specific MCE features such as
 	   the DRAM Error Threshold.
 config X86_MCE_NONFATAL
 	tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
-	depends on X86_MCE
+	depends on X86_32 && X86_MCE
 	help
 	  Enabling this feature starts a timer that triggers every 5 seconds which
 	  will look at the machine check registers to see if anything happened.
@ -411,14 +582,15 @@ config X86_MCE_NONFATAL
 config X86_MCE_P4THERMAL
 	bool "check for P4 thermal throttling interrupt."
-	depends on X86_MCE && (X86_UP_APIC || SMP) && !X86_VISWS
+	depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP) && !X86_VISWS
 	help
 	  Enabling this feature will cause a message to be printed when the P4
 	  enters thermal throttling.
 config VM86
 	default y
 	bool "Enable VM86 support" if EMBEDDED
 	default y
 	depends on X86_32
 	help
          This option is required by programs like DOSEMU to run 16-bit legacy
 	  code on X86 processors. It also may be needed by software like
@ -427,6 +599,7 @@ config VM86
 config TOSHIBA
 	tristate "Toshiba Laptop support"
 	depends on X86_32
 	---help---
 	  This adds a driver to safely access the System Management Mode of
 	  the CPU on Toshiba portables with a genuine Toshiba BIOS. It does
@ -442,6 +615,7 @@ config TOSHIBA
 config I8K
 	tristate "Dell laptop support"
 	depends on X86_32
 	---help---
 	  This adds a driver to safely access the System Management Mode
 	  of the CPU on the Dell Inspiron 8000. The System Management Mode
@ -462,7 +636,7 @@ config I8K
 config X86_REBOOTFIXUPS
 	bool "Enable X86 board specific fixups for reboot"
-	depends on X86
+	depends on X86_32 && X86
 	default n
 	---help---
 	  This enables chipset and/or board specific fixups to be done
@ -517,12 +691,11 @@ config X86_CPUID
 	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
 	  /dev/cpu/31/cpuid.
 source "drivers/firmware/Kconfig"
 choice
 	prompt "High Memory Support"
 	default HIGHMEM4G if !X86_NUMAQ
 	default HIGHMEM64G if X86_NUMAQ
 	depends on X86_32
 config NOHIGHMEM
 	bool "off"
@ -582,6 +755,7 @@ choice
 	depends on EXPERIMENTAL
 	prompt "Memory split" if EMBEDDED
 	default VMSPLIT_3G
 	depends on X86_32
 	help
 	  Select the desired split between kernel and user memory.
@ -619,16 +793,17 @@ config PAGE_OFFSET
 	default 0x78000000 if VMSPLIT_2G_OPT
 	default 0x40000000 if VMSPLIT_1G
 	default 0xC0000000
 	depends on X86_32
 config HIGHMEM
 	bool
-	depends on HIGHMEM64G || HIGHMEM4G
+	depends on X86_32 && (HIGHMEM64G || HIGHMEM4G)
 	default y
 config X86_PAE
 	bool "PAE (Physical Address Extension) Support"
 	default n
-	depends on !HIGHMEM4G
+	depends on X86_32 && !HIGHMEM4G
 	select RESOURCES_64BIT
 	help
 	  PAE is required for NX support, and furthermore enables
@ -639,46 +814,82 @@ config X86_PAE
 # Common NUMA Features
 config NUMA
 	bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
-	depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL
+	depends on SMP
 	depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
 	default n if X86_PC
 	default y if (X86_NUMAQ || X86_SUMMIT)
 	help
-	  NUMA support for i386. This is currently highly experimental
+	  Enable NUMA (Non Uniform Memory Access) support.
-	  and should be only used for kernel development. It might also
+	  The kernel will try to allocate memory used by a CPU on the
-	  cause boot failures.
+	  local memory controller of the CPU and add some more
 	  NUMA awareness to the kernel.
 	  For i386 this is currently highly experimental and should be only
 	  used for kernel development. It might also cause boot failures.
 	  For x86_64 this is recommended on all multiprocessor Opteron systems.
 	  If the system is EM64T, you should say N unless your system is
 	  EM64T NUMA.
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
-	depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
+	depends on X86_32 && X86_SUMMIT && (!HIGHMEM64G || !ACPI)
 config K8_NUMA
       bool "Old style AMD Opteron NUMA detection"
       depends on X86_64 && NUMA && PCI
       default y
       help
 	 Enable K8 NUMA node topology detection.  You should say Y here if
 	 you have a multi processor AMD K8 system. This uses an old
 	 method to read the NUMA configuration directly from the builtin
 	 Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
 	 instead, which also takes priority if both are compiled in.
 config X86_64_ACPI_NUMA
 	bool "ACPI NUMA detection"
 	depends on X86_64 && NUMA && ACPI && PCI
 	select ACPI_NUMA
 	default y
 	help
 	  Enable ACPI SRAT based node topology detection.
 config NUMA_EMU
 	bool "NUMA emulation"
 	depends on X86_64 && NUMA
 	help
 	  Enable NUMA emulation. A flat machine will be split
 	  into virtual nodes when booted with "numa=fake=N", where N is the
 	  number of nodes. This is only useful for debugging.
 config NODES_SHIFT
 	int
 	default "6" if X86_64
 	default "4" if X86_NUMAQ
 	default "3"
 	depends on NEED_MULTIPLE_NODES
 config HAVE_ARCH_BOOTMEM_NODE
 	bool
-	depends on NUMA
+	depends on X86_32 && NUMA
 	default y
 config ARCH_HAVE_MEMORY_PRESENT
 	bool
-	depends on DISCONTIGMEM
+	depends on X86_32 && DISCONTIGMEM
 	default y
 config NEED_NODE_MEMMAP_SIZE
 	bool
-	depends on DISCONTIGMEM || SPARSEMEM
+	depends on X86_32 && (DISCONTIGMEM || SPARSEMEM)
 	default y
 config HAVE_ARCH_ALLOC_REMAP
 	bool
-	depends on NUMA
+	depends on X86_32 && NUMA
 	default y
 config ARCH_FLATMEM_ENABLE
 	def_bool y
-	depends on (ARCH_SELECT_MEMORY_MODEL && X86_PC)
+	depends on (X86_32 && ARCH_SELECT_MEMORY_MODEL && X86_PC) || (X86_64 && !NUMA)
 config ARCH_DISCONTIGMEM_ENABLE
 	def_bool y
@ -690,21 +901,23 @@ config ARCH_DISCONTIGMEM_DEFAULT
 config ARCH_SPARSEMEM_ENABLE
 	def_bool y
-	depends on (NUMA || (X86_PC && EXPERIMENTAL))
+	depends on NUMA || (EXPERIMENTAL && (X86_PC || X86_64))
-	select SPARSEMEM_STATIC
+	select SPARSEMEM_STATIC if X86_32
 	select SPARSEMEM_VMEMMAP_ENABLE if X86_64
 config ARCH_SELECT_MEMORY_MODEL
 	def_bool y
-	depends on ARCH_SPARSEMEM_ENABLE
+	depends on X86_32 && ARCH_SPARSEMEM_ENABLE
-config ARCH_POPULATES_NODE_MAP
+config ARCH_MEMORY_PROBE
-	def_bool y
+	def_bool X86_64
 	depends on MEMORY_HOTPLUG
 source "mm/Kconfig"
 config HIGHPTE
 	bool "Allocate 3rd-level pagetables from highmem"
-	depends on HIGHMEM4G || HIGHMEM64G
+	depends on X86_32 && (HIGHMEM4G || HIGHMEM64G)
 	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
@ -712,7 +925,8 @@ config HIGHPTE
 	  entries in high memory.
 config MATH_EMULATION
-	bool "Math emulation"
+	bool
 	prompt "Math emulation" if X86_32
 	---help---
 	  Linux can emulate a math coprocessor (used for floating point
 	  operations) if you don't have one. 486DX and Pentium processors have
@ -772,7 +986,7 @@ config MTRR
 config EFI
 	bool "Boot from EFI support"
-	depends on ACPI
+	depends on X86_32 && ACPI
 	default n
 	---help---
 	This enables the kernel to boot on EFI platforms using
@ -789,18 +1003,18 @@ config EFI
 	kernel should continue to boot on existing non-EFI platforms.
 config IRQBALANCE
- 	bool "Enable kernel irq balancing"
+	bool "Enable kernel irq balancing"
-	depends on SMP && X86_IO_APIC
+	depends on X86_32 && SMP && X86_IO_APIC
 	default y
 	help
- 	  The default yes will allow the kernel to do irq load balancing.
+	  The default yes will allow the kernel to do irq load balancing.
 	  Saying no will keep the kernel from doing irq load balancing.
 # turning this on wastes a bunch of space.
 # Summit needs it only when NUMA is on
 config BOOT_IOREMAP
 	bool
-	depends on (((X86_SUMMIT || X86_GENERICARCH) && NUMA) || (X86 && EFI))
+	depends on X86_32 && (((X86_SUMMIT || X86_GENERICARCH) && NUMA) || (X86 && EFI))
 	default y
 config SECCOMP
@ -820,6 +1034,30 @@ config SECCOMP
 	  If unsure, say Y. Only embedded should say N here.
 config CC_STACKPROTECTOR
 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
 	depends on X86_64 && EXPERIMENTAL
 	help
         This option turns on the -fstack-protector GCC feature. This
 	  feature puts, at the beginning of critical functions, a canary
 	  value on the stack just before the return address, and validates
 	  the value just before actually returning.  Stack based buffer
 	  overflows (that need to overwrite this return address) now also
 	  overwrite the canary, which gets detected and the attack is then
 	  neutralized via a kernel panic.
 	  This feature requires gcc version 4.2 or above, or a distribution
 	  gcc with the feature backported. Older versions are automatically
 	  detected and for those versions, this configuration option is ignored.
 config CC_STACKPROTECTOR_ALL
 	bool "Use stack-protector for all functions"
 	depends on CC_STACKPROTECTOR
 	help
 	  Normally, GCC only inserts the canary value protection for
 	  functions that use large-ish on-stack buffers. By enabling
 	  this option, GCC will be asked to do this for ALL functions.
 source kernel/Kconfig.hz
 config KEXEC
@ -841,7 +1079,7 @@ config KEXEC
 config CRASH_DUMP
 	bool "kernel crash dumps (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
-	depends on HIGHMEM
+	depends on X86_64 || (X86_32 && HIGHMEM)
 	help
 	  Generate crash dump after being started by kexec.
 	  This should be normally only set in special crash dump kernels
@ -856,6 +1094,7 @@ config CRASH_DUMP
 config PHYSICAL_START
 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
 	default "0x1000000" if X86_NUMAQ
 	default "0x200000" if X86_64
 	default "0x100000"
 	help
 	  This gives the physical address where the kernel is loaded.
@ -908,25 +1147,31 @@ config RELOCATABLE
 	  must live at a different physical address than the primary
 	  kernel.
 	  Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address
 	  it has been loaded at and the compile time physical address
 	  (CONFIG_PHYSICAL_START) is ignored.
 config PHYSICAL_ALIGN
-	hex "Alignment value to which kernel should be aligned"
+	hex
-	default "0x100000"
+	prompt "Alignment value to which kernel should be aligned" if X86_32
 	default "0x100000" if X86_32
 	default "0x200000" if X86_64
 	range 0x2000 0x400000
 	help
 	  This value puts the alignment restrictions on physical address
- 	  where kernel is loaded and run from. Kernel is compiled for an
+	  where kernel is loaded and run from. Kernel is compiled for an
- 	  address which meets above alignment restriction.
+	  address which meets above alignment restriction.
- 	  If bootloader loads the kernel at a non-aligned address and
+	  If bootloader loads the kernel at a non-aligned address and
- 	  CONFIG_RELOCATABLE is set, kernel will move itself to nearest
+	  CONFIG_RELOCATABLE is set, kernel will move itself to nearest
- 	  address aligned to above value and run from there.
+	  address aligned to above value and run from there.
- 	  If bootloader loads the kernel at a non-aligned address and
+	  If bootloader loads the kernel at a non-aligned address and
- 	  CONFIG_RELOCATABLE is not set, kernel will ignore the run time
+	  CONFIG_RELOCATABLE is not set, kernel will ignore the run time
- 	  load address and decompress itself to the address it has been
+	  load address and decompress itself to the address it has been
- 	  compiled for and run from there. The address for which kernel is
+	  compiled for and run from there. The address for which kernel is
- 	  compiled already meets above alignment restrictions. Hence the
+	  compiled already meets above alignment restrictions. Hence the
- 	  end result is that kernel runs from a physical address meeting
+	  end result is that kernel runs from a physical address meeting
 	  above alignment restrictions.
 	  Don't change this unless you know what you are doing.
@ -938,10 +1183,13 @@ config HOTPLUG_CPU
 	  Say Y here to experiment with turning CPUs off and on, and to
 	  enable suspend on SMP systems. CPUs can be controlled through
 	  /sys/devices/system/cpu.
 	  Say N if you want to disable CPU hotplug and don't need to
 	  suspend.
 config COMPAT_VDSO
 	bool "Compat VDSO support"
 	default y
 	depends on X86_32
 	help
 	  Map the VDSO to the predictable old-style address too.
 	---help---
@ -955,18 +1203,35 @@ endmenu
 config ARCH_ENABLE_MEMORY_HOTPLUG
 	def_bool y
-	depends on HIGHMEM
+	depends on X86_64 || (X86_32 && HIGHMEM)
-menu "Power management options (ACPI, APM)"
+config MEMORY_HOTPLUG_RESERVE
 	def_bool X86_64
 	depends on (MEMORY_HOTPLUG && DISCONTIGMEM)
 config HAVE_ARCH_EARLY_PFN_TO_NID
 	def_bool X86_64
 	depends on NUMA
 config OUT_OF_LINE_PFN_TO_PAGE
 	def_bool X86_64
 	depends on DISCONTIGMEM
 menu "Power management options"
 	depends on !X86_VOYAGER
-source kernel/power/Kconfig
+config ARCH_HIBERNATION_HEADER
 	bool
 	depends on X86_64 && HIBERNATION
 	default y
 source "kernel/power/Kconfig"
 source "drivers/acpi/Kconfig"
 menuconfig APM
 	tristate "APM (Advanced Power Management) BIOS support"
-	depends on PM_SLEEP && !X86_VISWS
+	depends on X86_32 && PM_SLEEP && !X86_VISWS
 	---help---
 	  APM is a BIOS specification for saving power using several different
 	  techniques. This is mostly useful for battery powered laptops with
@ -1092,13 +1357,14 @@ config APM_REAL_MODE_POWER_OFF
 endif # APM
-source "arch/x86/kernel/cpu/cpufreq/Kconfig_32"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig"
 source "drivers/cpuidle/Kconfig"
 endmenu
-menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
+
 menu "Bus options (PCI etc.)"
 config PCI
 	bool "PCI support" if !X86_VISWS
@ -1118,7 +1384,7 @@ config PCI
 choice
 	prompt "PCI access mode"
-	depends on PCI && !X86_VISWS
+	depends on X86_32 && PCI && !X86_VISWS
 	default PCI_GOANY
 	---help---
 	  On PCI systems, the BIOS can be used to detect the PCI devices and
@ -1151,17 +1417,18 @@ endchoice
 config PCI_BIOS
 	bool
-	depends on !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY)
+	depends on X86_32 && !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY)
 	default y
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
 	bool
- 	depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
+	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
 	default y
 config PCI_MMCONFIG
 	bool
-	depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
+	depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
 	default y
 config PCI_DOMAINS
@ -1169,14 +1436,52 @@ config PCI_DOMAINS
 	depends on PCI
 	default y
 config PCI_MMCONFIG
 	bool "Support mmconfig PCI config space access"
 	depends on X86_64 && PCI && ACPI
 config DMAR
 	bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
 	depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL
 	help
 	  DMA remapping (DMAR) devices support enables independent address
 	  translations for Direct Memory Access (DMA) from devices.
 	  These DMA remapping devices are reported via ACPI tables
 	  and include PCI device scope covered by these DMA
 	  remapping devices.
 config DMAR_GFX_WA
 	bool "Support for Graphics workaround"
 	depends on DMAR
 	default y
 	help
 	 Current Graphics drivers tend to use physical address
 	 for DMA and avoid using DMA APIs. Setting this config
 	 option permits the IOMMU driver to set a unity map for
 	 all the OS-visible memory. Hence the driver can continue
 	 to use physical addresses for DMA.
 config DMAR_FLOPPY_WA
 	bool
 	depends on DMAR
 	default y
 	help
 	 Floppy disk drivers are know to bypass DMA API calls
 	 thereby failing to work when IOMMU is enabled. This
 	 workaround will setup a 1:1 mapping for the first
 	 16M to make floppy (an ISA device) work.
 source "drivers/pci/pcie/Kconfig"
 source "drivers/pci/Kconfig"
 # x86_64 have no ISA slots, but do have ISA-style DMA.
 config ISA_DMA_API
 	bool
 	default y
 if X86_32
 config ISA
 	bool "ISA support"
 	depends on !(X86_VOYAGER || X86_VISWS)
@ -1248,9 +1553,11 @@ config GEODE_MFGPT_TIMER
 	  MFGPTs have a better resolution and max interval than the
 	  generic PIT, and are suitable for use as high-res timers.
 endif # X86_32
 config K8_NB
 	def_bool y
-	depends on AGP_AMD64
+	depends on AGP_AMD64 || (X86_64 && (GART_IOMMU || (PCI && NUMA)))
 source "drivers/pcmcia/Kconfig"
@ -1258,16 +1565,48 @@ source "drivers/pci/hotplug/Kconfig"
 endmenu
-menu "Executable file formats"
+
 menu "Executable file formats / Emulations"
 source "fs/Kconfig.binfmt"
 config IA32_EMULATION
 	bool "IA32 Emulation"
 	depends on X86_64
 	help
 	  Include code to run 32-bit programs under a 64-bit kernel. You should
 	  likely turn this on, unless you're 100% sure that you don't have any
 	  32-bit programs left.
 config IA32_AOUT
       tristate "IA32 a.out support"
       depends on IA32_EMULATION
       help
         Support old a.out binaries in the 32bit emulation.
 config COMPAT
 	bool
 	depends on IA32_EMULATION
 	default y
 config COMPAT_FOR_U64_ALIGNMENT
 	def_bool COMPAT
 	depends on X86_64
 config SYSVIPC_COMPAT
 	bool
 	depends on X86_64 && COMPAT && SYSVIPC
 	default y
 endmenu
 source "net/Kconfig"
 source "drivers/Kconfig"
 source "drivers/firmware/Kconfig"
 source "fs/Kconfig"
 source "kernel/Kconfig.instrumentation"
@ -1279,43 +1618,3 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 source "lib/Kconfig"
 #
 # Use the generic interrupt handling code in kernel/irq/:
 #
 config GENERIC_HARDIRQS
 	bool
 	default y
 config GENERIC_IRQ_PROBE
 	bool
 	default y
 config GENERIC_PENDING_IRQ
 	bool
 	depends on GENERIC_HARDIRQS && SMP
 	default y
 config X86_SMP
 	bool
 	depends on SMP && !X86_VOYAGER
 	default y
 config X86_HT
 	bool
 	depends on SMP && !(X86_VISWS || X86_VOYAGER)
 	default y
 config X86_BIOS_REBOOT
 	bool
 	depends on !(X86_VISWS || X86_VOYAGER)
 	default y
 config X86_TRAMPOLINE
 	bool
 	depends on X86_SMP || (X86_VOYAGER && SMP)
 	default y
 config KTIME_SCALAR
 	bool
 	default y
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@ -3,11 +3,12 @@ if !X86_ELAN
 choice
 	prompt "Processor family"
-	default M686
+	default M686 if X86_32
 	default GENERIC_CPU if X86_64
 config M386
 	bool "386"
-	depends on !UML
+	depends on X86_32 && !UML
 	---help---
 	  This is the processor type of your CPU. This information is used for
 	  optimizing purposes. In order to compile a kernel that can run on
@ -49,6 +50,7 @@ config M386
 config M486
 	bool "486"
 	depends on X86_32
 	help
 	  Select this for a 486 series processor, either Intel or one of the
 	  compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
@ -57,6 +59,7 @@ config M486
 config M586
 	bool "586/K5/5x86/6x86/6x86MX"
 	depends on X86_32
 	help
 	  Select this for an 586 or 686 series processor such as the AMD K5,
 	  the Cyrix 5x86, 6x86 and 6x86MX.  This choice does not
@ -64,18 +67,21 @@ config M586
 config M586TSC
 	bool "Pentium-Classic"
 	depends on X86_32
 	help
 	  Select this for a Pentium Classic processor with the RDTSC (Read
 	  Time Stamp Counter) instruction for benchmarking.
 config M586MMX
 	bool "Pentium-MMX"
 	depends on X86_32
 	help
 	  Select this for a Pentium with the MMX graphics/multimedia
 	  extended instructions.
 config M686
 	bool "Pentium-Pro"
 	depends on X86_32
 	help
 	  Select this for Intel Pentium Pro chips.  This enables the use of
 	  Pentium Pro extended instructions, and disables the init-time guard
@ -83,6 +89,7 @@ config M686
 config MPENTIUMII
 	bool "Pentium-II/Celeron(pre-Coppermine)"
 	depends on X86_32
 	help
 	  Select this for Intel chips based on the Pentium-II and
 	  pre-Coppermine Celeron core.  This option enables an unaligned
@ -92,6 +99,7 @@ config MPENTIUMII
 config MPENTIUMIII
 	bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon"
 	depends on X86_32
 	help
 	  Select this for Intel chips based on the Pentium-III and
 	  Celeron-Coppermine core.  This option enables use of some
@ -100,19 +108,14 @@ config MPENTIUMIII
 config MPENTIUMM
 	bool "Pentium M"
 	depends on X86_32
 	help
 	  Select this for Intel Pentium M (not Pentium-4 M)
 	  notebook chips.
 config MCORE2
 	bool "Core 2/newer Xeon"
 	help
 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
 	  CPUs. You can distinguish newer from older Xeons by the CPU family
 	  in /proc/cpuinfo. Newer ones have 6 and older ones 15 (not a typo)
 config MPENTIUM4
 	bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/older Xeon"
 	depends on X86_32
 	help
 	  Select this for Intel Pentium 4 chips.  This includes the
 	  Pentium 4, Pentium D, P4-based Celeron and Xeon, and
@ -148,6 +151,7 @@ config MPENTIUM4
 config MK6
 	bool "K6/K6-II/K6-III"
 	depends on X86_32
 	help
 	  Select this for an AMD K6-family processor.  Enables use of
 	  some extended instructions, and passes appropriate optimization
@ -155,6 +159,7 @@ config MK6
 config MK7
 	bool "Athlon/Duron/K7"
 	depends on X86_32
 	help
 	  Select this for an AMD Athlon K7-family processor.  Enables use of
 	  some extended instructions, and passes appropriate optimization
@ -169,6 +174,7 @@ config MK8
 config MCRUSOE
 	bool "Crusoe"
 	depends on X86_32
 	help
 	  Select this for a Transmeta Crusoe processor.  Treats the processor
 	  like a 586 with TSC, and sets some GCC optimization flags (like a
@ -176,11 +182,13 @@ config MCRUSOE
 config MEFFICEON
 	bool "Efficeon"
 	depends on X86_32
 	help
 	  Select this for a Transmeta Efficeon processor.
 config MWINCHIPC6
 	bool "Winchip-C6"
 	depends on X86_32
 	help
 	  Select this for an IDT Winchip C6 chip.  Linux and GCC
 	  treat this chip as a 586TSC with some extended instructions
@ -188,6 +196,7 @@ config MWINCHIPC6
 config MWINCHIP2
 	bool "Winchip-2"
 	depends on X86_32
 	help
 	  Select this for an IDT Winchip-2.  Linux and GCC
 	  treat this chip as a 586TSC with some extended instructions
@ -195,6 +204,7 @@ config MWINCHIP2
 config MWINCHIP3D
 	bool "Winchip-2A/Winchip-3"
 	depends on X86_32
 	help
 	  Select this for an IDT Winchip-2A or 3.  Linux and GCC
 	  treat this chip as a 586TSC with some extended instructions
@ -204,16 +214,19 @@ config MWINCHIP3D
 config MGEODEGX1
 	bool "GeodeGX1"
 	depends on X86_32
 	help
 	  Select this for a Geode GX1 (Cyrix MediaGX) chip.
 config MGEODE_LX
       bool "Geode GX/LX"
 	depends on X86_32
       help
         Select this for AMD Geode GX and LX processors.
 config MCYRIXIII
 	bool "CyrixIII/VIA-C3"
 	depends on X86_32
 	help
 	  Select this for a Cyrix III or C3 chip.  Presently Linux and GCC
 	  treat this chip as a generic 586. Whilst the CPU is 686 class,
@ -225,6 +238,7 @@ config MCYRIXIII
 config MVIAC3_2
 	bool "VIA C3-2 (Nehemiah)"
 	depends on X86_32
 	help
 	  Select this for a VIA C3 "Nehemiah". Selecting this enables usage
 	  of SSE and tells gcc to treat the CPU as a 686.
@ -232,15 +246,42 @@ config MVIAC3_2
 config MVIAC7
 	bool "VIA C7"
 	depends on X86_32
 	help
 	  Select this for a VIA C7.  Selecting this uses the correct cache
 	  shift and tells gcc to treat the CPU as a 686.
 config MPSC
 	bool "Intel P4 / older Netburst based Xeon"
 	depends on X86_64
 	help
 	  Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey
 	  Xeon CPUs with Intel 64bit which is compatible with x86-64.
 	  Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the
          Netburst core and shouldn't use this option. You can distinguish them
 	  using the cpu family field
 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
 config MCORE2
 	bool "Core 2/newer Xeon"
 	help
 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
 	  CPUs. You can distinguish newer from older Xeons by the CPU family
 	  in /proc/cpuinfo. Newer ones have 6 and older ones 15 (not a typo)
 config GENERIC_CPU
 	bool "Generic-x86-64"
 	depends on X86_64
 	help
 	  Generic x86-64 CPU.
 	  Run equally well on all x86-64 CPUs.
 endchoice
 config X86_GENERIC
-       bool "Generic x86 support"
+	bool "Generic x86 support"
-       help
+	depends on X86_32
 	help
 	  Instead of just including optimizations for the selected
 	  x86 variant (e.g. PII, Crusoe or Athlon), include some more
 	  generic optimizations as well. This will make the kernel
@ -253,44 +294,31 @@ endif
 #
 # Define implied options from the CPU selection here
-#
+config X86_L1_CACHE_BYTES
 	int
 	default "128" if GENERIC_CPU || MPSC
 	default "64" if MK8 || MCORE2
 	depends on X86_64
 config X86_INTERNODE_CACHE_BYTES
 	int
 	default "4096" if X86_VSMP
 	default X86_L1_CACHE_BYTES if !X86_VSMP
 	depends on X86_64
 config X86_CMPXCHG
-	bool
+	def_bool X86_64 || (X86_32 && !M386)
 	depends on !M386
 	default y
 config X86_L1_CACHE_SHIFT
 	int
-	default "7" if MPENTIUM4 || X86_GENERIC
+	default "7" if MPENTIUM4 || X86_GENERIC || GENERIC_CPU || MPSC
 	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1
 	default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
 	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MVIAC7
 config X86_XADD
 	bool
-	depends on !M386
+	depends on X86_32 && !M386
 	default y
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	depends on !X86_XADD
 	default y
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 	depends on X86_XADD
 	default y
 config ARCH_HAS_ILOG2_U32
 	bool
 	default n
 config ARCH_HAS_ILOG2_U64
 	bool
 	default n
 config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 config X86_PPRO_FENCE
@ -305,22 +333,22 @@ config X86_F00F_BUG
 config X86_WP_WORKS_OK
 	bool
-	depends on !M386
+	depends on X86_32 && !M386
 	default y
 config X86_INVLPG
 	bool
-	depends on !M386
+	depends on X86_32 && !M386
 	default y
 config X86_BSWAP
 	bool
-	depends on !M386
+	depends on X86_32 && !M386
 	default y
 config X86_POPAD_OK
 	bool
-	depends on !M386
+	depends on X86_32 && !M386
 	default y
 config X86_ALIGNMENT_16
@ -330,7 +358,7 @@ config X86_ALIGNMENT_16
 config X86_GOOD_APIC
 	bool
-	depends on MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 || MEFFICEON || MCORE2 || MVIAC7
+	depends on MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 || MEFFICEON || MCORE2 || MVIAC7 || X86_64
 	default y
 config X86_INTEL_USERCOPY
@ -355,7 +383,7 @@ config X86_OOSTORE
 config X86_TSC
 	bool
-	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ
+	depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64
 	default y
 # this should be set for all -march=.. options where the compiler
@ -367,6 +395,7 @@ config X86_CMOV
 config X86_MINIMUM_CPU_FAMILY
 	int
-	default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
+	default "64" if X86_64
 	default "4" if X86_32 && (X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK)
 	default "3"
--- a/arch/x86/Kconfig.x86_64
+++ b/arch/x86/Kconfig.x86_64
@ -1,839 +0,0 @@
 #
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
 #
 # Note: ISA is disabled and will hopefully never be enabled.
 # If you managed to buy an ISA x86-64 box you'll have to fix all the
 # ISA drivers you need yourself.
 #
 mainmenu "Linux Kernel Configuration"
 config X86_64
 	bool
 	default y
 	help
 	  Port to the x86-64 architecture. x86-64 is a 64-bit extension to the
 	  classical 32-bit x86 architecture. For details see
 	  <http://www.x86-64.org/>.
 config 64BIT
 	def_bool y
 config X86
 	bool
 	default y
 config GENERIC_TIME
 	bool
 	default y
 config GENERIC_TIME_VSYSCALL
 	bool
 	default y
 config GENERIC_CMOS_UPDATE
 	bool
 	default y
 config CLOCKSOURCE_WATCHDOG
 	bool
 	default y
 config GENERIC_CLOCKEVENTS
 	bool
 	default y
 config GENERIC_CLOCKEVENTS_BROADCAST
 	bool
 	default y
 config ZONE_DMA32
 	bool
 	default y
 config LOCKDEP_SUPPORT
 	bool
 	default y
 config STACKTRACE_SUPPORT
 	bool
 	default y
 config SEMAPHORE_SLEEPERS
 	bool
 	default y
 config MMU
 	bool
 	default y
 config ZONE_DMA
 	bool
 	default y
 config ISA
 	bool
 config SBUS
 	bool
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 config GENERIC_HWEIGHT
 	bool
 	default y
 config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 config X86_CMPXCHG
 	bool
 	default y
 config GENERIC_ISA_DMA
 	bool
 	default y
 config GENERIC_IOMAP
 	bool
 	default y
 config ARCH_MAY_HAVE_PC_FDC
 	bool
 	default y
 config ARCH_POPULATES_NODE_MAP
 	def_bool y
 config DMI
 	bool
 	default y
 config AUDIT_ARCH
 	bool
 	default y
 config GENERIC_BUG
 	bool
 	default y
 	depends on BUG
 config ARCH_HAS_ILOG2_U32
 	bool
 	default n
 config ARCH_HAS_ILOG2_U64
 	bool
 	default n
 source "init/Kconfig"
 menu "Processor type and features"
 source "kernel/time/Kconfig"
 choice
 	prompt "Subarchitecture Type"
 	default X86_PC
 config X86_PC
 	bool "PC-compatible"
 	help
 	  Choose this option if your computer is a standard PC or compatible.
 config X86_VSMP
 	bool "Support for ScaleMP vSMP"
 	depends on PCI
 	 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.
 endchoice
 choice
 	prompt "Processor family"
 	default GENERIC_CPU
 config MK8
 	bool "AMD-Opteron/Athlon64"
 	help
 	  Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs.
 config MPSC
       bool "Intel P4 / older Netburst based Xeon"
       help
 	  Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey
 	  Xeon CPUs with Intel 64bit which is compatible with x86-64.
 	  Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the
          Netburst core and shouldn't use this option. You can distinguish them
 	  using the cpu family field
 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
 config MCORE2
 	bool "Intel Core2 / newer Xeon"
 	help
 	  Optimize for Intel Core2 and newer Xeons (51xx)
 	  You can distinguish the newer Xeons from the older ones using
 	  the cpu family field in /proc/cpuinfo. 15 is an older Xeon
 	  (use CONFIG_MPSC then), 6 is a newer one.
 config GENERIC_CPU
 	bool "Generic-x86-64"
 	help
 	  Generic x86-64 CPU.
 	  Run equally well on all x86-64 CPUs.
 endchoice
 #
 # Define implied options from the CPU selection here
 #
 config X86_L1_CACHE_BYTES
 	int
 	default "128" if GENERIC_CPU || MPSC
 	default "64" if MK8 || MCORE2
 config X86_L1_CACHE_SHIFT
 	int
 	default "7" if GENERIC_CPU || MPSC
 	default "6" if MK8 || MCORE2
 config X86_INTERNODE_CACHE_BYTES
 	int
 	default "4096" if X86_VSMP
 	default X86_L1_CACHE_BYTES if !X86_VSMP
 config X86_TSC
 	bool
 	default y
 config X86_GOOD_APIC
 	bool
 	default y
 config MICROCODE
 	tristate "/dev/cpu/microcode - Intel CPU microcode support"
 	select FW_LOADER
 	---help---
 	  If you say Y here the 'File systems' section, you will be
 	  able to update the microcode on Intel processors. You will
 	  obviously need the actual microcode binary data itself which is
 	  not shipped with the Linux kernel.
 	  For latest news and information on obtaining all the required
 	  ingredients for this driver, check:
 	  <http://www.urbanmyth.org/microcode/>.
 	  To compile this driver as a module, choose M here: the
 	  module will be called microcode.
 	  If you use modprobe or kmod you may also want to add the line
 	  'alias char-major-10-184 microcode' to your /etc/modules.conf file.
 config MICROCODE_OLD_INTERFACE
 	bool
 	depends on MICROCODE
 	default y
 config X86_MSR
 	tristate "/dev/cpu/*/msr - Model-specific register support"
 	help
 	  This device gives privileged processes access to the x86
 	  Model-Specific Registers (MSRs).  It is a character device with
 	  major 202 and minors 0 to 31 for /dev/cpu/0/msr to /dev/cpu/31/msr.
 	  MSR accesses are directed to a specific CPU on multi-processor
 	  systems.
 config X86_CPUID
 	tristate "/dev/cpu/*/cpuid - CPU information support"
 	help
 	  This device gives processes access to the x86 CPUID instruction to
 	  be executed on a specific processor.  It is a character device
 	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
 	  /dev/cpu/31/cpuid.
 config X86_HT
 	bool
 	depends on SMP && !MK8
 	default y
 config MATH_EMULATION
 	bool
 config MCA
 	bool
 config EISA
 	bool
 config X86_IO_APIC
 	bool
 	default y
 config X86_LOCAL_APIC
 	bool
 	default y
 config MTRR
 	bool "MTRR (Memory Type Range Register) support"
 	---help---
 	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
 	  the Memory Type Range Registers (MTRRs) may be used to control
 	  processor access to memory ranges. This is most useful if you have
 	  a video (VGA) card on a PCI or AGP bus. Enabling write-combining
 	  allows bus write transfers to be combined into a larger transfer
 	  before bursting over the PCI/AGP bus. This can increase performance
 	  of image write operations 2.5 times or more. Saying Y here creates a
 	  /proc/mtrr file which may be used to manipulate your processor's
 	  MTRRs. Typically the X server should use this.
 	  This code has a reasonably generic interface so that similar
 	  control registers on other processors can be easily supported
 	  as well.
 	  Saying Y here also fixes a problem with buggy SMP BIOSes which only
 	  set the MTRRs for the boot CPU and not for the secondary CPUs. This
 	  can lead to all sorts of problems, so it's good to say Y here.
 	  Just say Y here, all x86-64 machines support MTRRs.
 	  See <file:Documentation/mtrr.txt> for more information.
 config SMP
 	bool "Symmetric multi-processing support"
 	---help---
 	  This enables support for systems with more than one CPU. If you have
 	  a system with only one CPU, like most personal computers, say N. If
 	  you have a system with more than one CPU, say Y.
 	  If you say N here, the kernel will run on single and multiprocessor
 	  machines, but will use only one CPU of a multiprocessor machine. If
 	  you say Y here, the kernel will run on many, but not all,
 	  singleprocessor machines. On a singleprocessor machine, the kernel
 	  will run faster if you say N here.
 	  If you don't know what to do here, say N.
 config SCHED_SMT
 	bool "SMT (Hyperthreading) scheduler support"
 	depends on SMP
 	default n
 	help
 	  SMT scheduler support improves the CPU scheduler's decision making
 	  when dealing with Intel Pentium 4 chips with HyperThreading at a
 	  cost of slightly increased overhead in some places. If unsure say
 	  N here.
 config SCHED_MC
 	bool "Multi-core scheduler support"
 	depends on SMP
 	default y
 	help
 	  Multi-core scheduler support improves the CPU scheduler's decision
 	  making when dealing with multi-core CPU chips at a cost of slightly
 	  increased overhead in some places. If unsure say N here.
 source "kernel/Kconfig.preempt"
 config NUMA
       bool "Non Uniform Memory Access (NUMA) Support"
       depends on SMP
       help
 	 Enable NUMA (Non Uniform Memory Access) support. The kernel 
 	 will try to allocate memory used by a CPU on the local memory 
 	 controller of the CPU and add some more NUMA awareness to the kernel.
 	 This code is recommended on all multiprocessor Opteron systems.
 	 If the system is EM64T, you should say N unless your system is EM64T 
 	 NUMA. 
 config K8_NUMA
       bool "Old style AMD Opteron NUMA detection"
       depends on NUMA && PCI
       default y
       help
 	 Enable K8 NUMA node topology detection.  You should say Y here if
 	 you have a multi processor AMD K8 system. This uses an old
 	 method to read the NUMA configuration directly from the builtin
 	 Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
 	 instead, which also takes priority if both are compiled in.   
 config NODES_SHIFT
 	int
 	default "6"
 	depends on NEED_MULTIPLE_NODES
 # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
 config X86_64_ACPI_NUMA
       bool "ACPI NUMA detection"
       depends on NUMA
       select ACPI 
 	select PCI
       select ACPI_NUMA
       default y
       help
 	 Enable ACPI SRAT based node topology detection.
 config NUMA_EMU
 	bool "NUMA emulation"
 	depends on NUMA
 	help
 	  Enable NUMA emulation. A flat machine will be split
 	  into virtual nodes when booted with "numa=fake=N", where N is the
 	  number of nodes. This is only useful for debugging.
 config ARCH_DISCONTIGMEM_ENABLE
       bool
       depends on NUMA
       default y
 config ARCH_DISCONTIGMEM_DEFAULT
 	def_bool y
 	depends on NUMA
 config ARCH_SPARSEMEM_ENABLE
 	def_bool y
 	depends on (NUMA || EXPERIMENTAL)
 	select SPARSEMEM_VMEMMAP_ENABLE
 config ARCH_MEMORY_PROBE
 	def_bool y
 	depends on MEMORY_HOTPLUG
 config ARCH_FLATMEM_ENABLE
 	def_bool y
 	depends on !NUMA
 source "mm/Kconfig"
 config MEMORY_HOTPLUG_RESERVE
 	def_bool y
 	depends on (MEMORY_HOTPLUG && DISCONTIGMEM)
 config HAVE_ARCH_EARLY_PFN_TO_NID
 	def_bool y
 	depends on NUMA
 config OUT_OF_LINE_PFN_TO_PAGE
 	def_bool y
 	depends on DISCONTIGMEM
 config NR_CPUS
 	int "Maximum number of CPUs (2-255)"
 	range 2 255
 	depends on SMP
 	default "8"
 	help
 	  This allows you to specify the maximum number of CPUs which this
 	  kernel will support. Current maximum is 255 CPUs due to
 	  APIC addressing limits. Less depending on the hardware.
 	  This is purely to save memory - each supported CPU requires
 	  memory in the static kernel configuration.
 config PHYSICAL_ALIGN
 	hex
 	default "0x200000"
 config HOTPLUG_CPU
 	bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
 	depends on SMP && HOTPLUG && EXPERIMENTAL
 	help
 		Say Y here to experiment with turning CPUs off and on.  CPUs
 		can be controlled through /sys/devices/system/cpu/cpu#.
 		This is also required for suspend/hibernation on SMP systems.
 		Say N if you want to disable CPU hotplug and don't need to
 		suspend.
 config ARCH_ENABLE_MEMORY_HOTPLUG
 	def_bool y
 config HPET_TIMER
 	bool
 	default y
 	help
 	  Use the IA-PC HPET (High Precision Event Timer) to manage
 	  time in preference to the PIT and RTC, if a HPET is
 	  present.  The HPET provides a stable time base on SMP
 	  systems, unlike the TSC, but it is more expensive to access,
 	  as it is off-chip.  You can find the HPET spec at
 	  <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 config HPET_EMULATE_RTC
 	bool
 	depends on HPET_TIMER && RTC=y
 	default y
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
 config GART_IOMMU
 	bool "GART IOMMU support" if EMBEDDED
 	default y
 	select SWIOTLB
 	select AGP
 	depends on PCI
 	help
 	  Support for full DMA access of devices with 32bit memory access only
 	  on systems with more than 3GB. This is usually needed for USB,
 	  sound, many IDE/SATA chipsets and some other devices.
 	  Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART
 	  based hardware IOMMU and a software bounce buffer based IOMMU used
 	  on Intel systems and as fallback.
 	  The code is only active when needed (enough memory and limited
 	  device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified
 	  too.
 config CALGARY_IOMMU
 	bool "IBM Calgary IOMMU support"
 	select SWIOTLB
 	depends on PCI && EXPERIMENTAL
 	help
 	  Support for hardware IOMMUs in IBM's xSeries x366 and x460
 	  systems. Needed to run systems with more than 3GB of memory
 	  properly with 32-bit PCI devices that do not support DAC
 	  (Double Address Cycle). Calgary also supports bus level
 	  isolation, where all DMAs pass through the IOMMU.  This
 	  prevents them from going anywhere except their intended
 	  destination. This catches hard-to-find kernel bugs and
 	  mis-behaving drivers and devices that do not use the DMA-API
 	  properly to set up their DMA buffers.  The IOMMU can be
 	  turned off at boot time with the iommu=off parameter.
 	  Normally the kernel will make the right choice by itself.
 	  If unsure, say Y.
 config CALGARY_IOMMU_ENABLED_BY_DEFAULT
 	bool "Should Calgary be enabled by default?"
 	default y
 	depends on CALGARY_IOMMU
 	help
 	  Should Calgary be enabled by default? if you choose 'y', Calgary
 	  will be used (if it exists). If you choose 'n', Calgary will not be
 	  used even if it exists. If you choose 'n' and would like to use
 	  Calgary anyway, pass 'iommu=calgary' on the kernel command line.
 	  If unsure, say Y.
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
 	bool
 	help
 	  Support for software bounce buffers used on x86-64 systems
 	  which don't have a hardware IOMMU (e.g. the current generation
 	  of Intel's x86-64 CPUs). Using this PCI devices which can only
 	  access 32-bits of memory can be used on systems with more than
 	  3 GB of memory. If unsure, say Y.
 config X86_MCE
 	bool "Machine check support" if EMBEDDED
 	default y
 	help
 	   Include a machine check error handler to report hardware errors.
 	   This version will require the mcelog utility to decode some
 	   machine check error logs. See
 	   ftp://ftp.x86-64.org/pub/linux/tools/mcelog
 config X86_MCE_INTEL
 	bool "Intel MCE features"
 	depends on X86_MCE && X86_LOCAL_APIC
 	default y
 	help
 	   Additional support for intel specific MCE features such as
 	   the thermal monitor.
 config X86_MCE_AMD
 	bool "AMD MCE features"
 	depends on X86_MCE && X86_LOCAL_APIC
 	default y
 	help
 	   Additional support for AMD specific MCE features such as
 	   the DRAM Error Threshold.
 config KEXEC
 	bool "kexec system call"
 	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
 	  but it is independent of the system firmware.   And like a reboot
 	  you can start any kernel with it, not just Linux.
 	  The name comes from the similarity to the exec system call.
 	  It is an ongoing process to be certain the hardware in a machine
 	  is properly shutdown, so do not be surprised if this code does not
 	  initially work for you.  It may help to enable device hotplugging
 	  support.  As of this writing the exact hardware interface is
 	  strongly in flux, so no good recommendation can be made.
 config CRASH_DUMP
 	bool "kernel crash dumps (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	help
 	  Generate crash dump after being started by kexec.
 	  This should be normally only set in special crash dump kernels
 	  which are loaded in the main kernel with kexec-tools into
 	  a specially reserved region and then later executed after
 	  a crash by kdump/kexec. The crash dump kernel must be compiled
 	  to a memory address not used by the main kernel or BIOS using
 	  PHYSICAL_START, or it must be built as a relocatable image
 	  (CONFIG_RELOCATABLE=y).
 	  For more details see Documentation/kdump/kdump.txt
 config RELOCATABLE
 	bool "Build a relocatable kernel (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	help
 	  Builds a relocatable kernel. This enables loading and running
 	  a kernel binary from a different physical address than it has
 	  been compiled for.
 	  One use is for the kexec on panic case where the recovery kernel
 	  must live at a different physical address than the primary
 	  kernel.
 	  Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address
 	  it has been loaded at and the compile time physical address
 	  (CONFIG_PHYSICAL_START) is ignored.
 config PHYSICAL_START
 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
 	default "0x200000"
 	help
 	  This gives the physical address where the kernel is loaded. It
 	  should be aligned to 2MB boundary.
 	  If kernel is a not relocatable (CONFIG_RELOCATABLE=n) then
 	  bzImage will decompress itself to above physical address and
 	  run from there. Otherwise, bzImage will run from the address where
 	  it has been loaded by the boot loader and will ignore above physical
 	  address.
 	  In normal kdump cases one does not have to set/change this option
 	  as now bzImage can be compiled as a completely relocatable image
 	  (CONFIG_RELOCATABLE=y) and be used to load and run from a different
 	  address. This option is mainly useful for the folks who don't want
 	  to use a bzImage for capturing the crash dump and want to use a
 	  vmlinux instead.
 	  So if you are using bzImage for capturing the crash dump, leave
 	  the value here unchanged to 0x200000 and set CONFIG_RELOCATABLE=y.
 	  Otherwise if you plan to use vmlinux for capturing the crash dump
 	  change this value to start of the reserved region (Typically 16MB
 	  0x1000000). In other words, it can be set based on the "X" value as
 	  specified in the "crashkernel=YM@XM" command line boot parameter
 	  passed to the panic-ed kernel. Typically this parameter is set as
 	  crashkernel=64M@16M. Please take a look at
 	  Documentation/kdump/kdump.txt for more details about crash dumps.
 	  Usage of bzImage for capturing the crash dump is advantageous as
 	  one does not have to build two kernels. Same kernel can be used
 	  as production kernel and capture kernel.
 	  Don't change this unless you know what you are doing.
 config SECCOMP
 	bool "Enable seccomp to safely compute untrusted bytecode"
 	depends on PROC_FS
 	default y
 	help
 	  This kernel feature is useful for number crunching applications
 	  that may need to compute untrusted bytecode during their
 	  execution. By using pipes or other transports made available to
 	  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
 	  and the task is only allowed to execute a few safe syscalls
 	  defined by each seccomp mode.
 	  If unsure, say Y. Only embedded should say N here.
 config CC_STACKPROTECTOR
 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	help
         This option turns on the -fstack-protector GCC feature. This
 	  feature puts, at the beginning of critical functions, a canary
 	  value on the stack just before the return address, and validates
 	  the value just before actually returning.  Stack based buffer
 	  overflows (that need to overwrite this return address) now also
 	  overwrite the canary, which gets detected and the attack is then
 	  neutralized via a kernel panic.
 	  This feature requires gcc version 4.2 or above, or a distribution
 	  gcc with the feature backported. Older versions are automatically
 	  detected and for those versions, this configuration option is ignored.
 config CC_STACKPROTECTOR_ALL
 	bool "Use stack-protector for all functions"
 	depends on CC_STACKPROTECTOR
 	help
 	  Normally, GCC only inserts the canary value protection for
 	  functions that use large-ish on-stack buffers. By enabling
 	  this option, GCC will be asked to do this for ALL functions.
 source kernel/Kconfig.hz
 config K8_NB
 	def_bool y
 	depends on AGP_AMD64 || GART_IOMMU || (PCI && NUMA)
 endmenu
 #
 # Use the generic interrupt handling code in kernel/irq/:
 #
 config GENERIC_HARDIRQS
 	bool
 	default y
 config GENERIC_IRQ_PROBE
 	bool
 	default y
 # we have no ISA slots, but we do have ISA-style DMA.
 config ISA_DMA_API
 	bool
 	default y
 config GENERIC_PENDING_IRQ
 	bool
 	depends on GENERIC_HARDIRQS && SMP
 	default y
 menu "Power management options"
 source kernel/power/Kconfig
 config ARCH_HIBERNATION_HEADER
 	bool
 	depends on HIBERNATION
 	default y
 source "drivers/acpi/Kconfig"
 source "arch/x86/kernel/cpu/cpufreq/Kconfig_64"
 source "drivers/cpuidle/Kconfig"
 endmenu
 menu "Bus options (PCI etc.)"
 config PCI
 	bool "PCI support"
 	select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
 	bool
 	depends on PCI
 	default y
 config PCI_MMCONFIG
 	bool "Support mmconfig PCI config space access"
 	depends on PCI && ACPI
 config PCI_DOMAINS
 	bool
 	depends on PCI
 	default y
 config DMAR
 	bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
 	depends on PCI_MSI && ACPI && EXPERIMENTAL
 	help
 	  DMA remapping (DMAR) devices support enables independent address
 	  translations for Direct Memory Access (DMA) from devices.
 	  These DMA remapping devices are reported via ACPI tables
 	  and include PCI device scope covered by these DMA
 	  remapping devices.
 config DMAR_GFX_WA
 	bool "Support for Graphics workaround"
 	depends on DMAR
 	default y
 	help
 	 Current Graphics drivers tend to use physical address
 	 for DMA and avoid using DMA APIs. Setting this config
 	 option permits the IOMMU driver to set a unity map for
 	 all the OS-visible memory. Hence the driver can continue
 	 to use physical addresses for DMA.
 config DMAR_FLOPPY_WA
 	bool
 	depends on DMAR
 	default y
 	help
 	 Floppy disk drivers are know to bypass DMA API calls
 	 thereby failing to work when IOMMU is enabled. This
 	 workaround will setup a 1:1 mapping for the first
 	 16M to make floppy (an ISA device) work.
 source "drivers/pci/pcie/Kconfig"
 source "drivers/pci/Kconfig"
 source "drivers/pcmcia/Kconfig"
 source "drivers/pci/hotplug/Kconfig"
 endmenu
 menu "Executable file formats / Emulations"
 source "fs/Kconfig.binfmt"
 config IA32_EMULATION
 	bool "IA32 Emulation"
 	help
 	  Include code to run 32-bit programs under a 64-bit kernel. You should
 	  likely turn this on, unless you're 100% sure that you don't have any
 	  32-bit programs left.
 config IA32_AOUT
       tristate "IA32 a.out support"
       depends on IA32_EMULATION
       help
         Support old a.out binaries in the 32bit emulation.
 config COMPAT
 	bool
 	depends on IA32_EMULATION
 	default y
 config COMPAT_FOR_U64_ALIGNMENT
 	def_bool COMPAT
 config SYSVIPC_COMPAT
 	bool
 	depends on COMPAT && SYSVIPC
 	default y
 endmenu
 source "net/Kconfig"
 source drivers/Kconfig
 source "drivers/firmware/Kconfig"
 source fs/Kconfig
 source "kernel/Kconfig.instrumentation"
 source "arch/x86/Kconfig.debug"
 source "security/Kconfig"
 source "crypto/Kconfig"
 source "lib/Kconfig"
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@ -1,12 +1,16 @@
 # Unified Makefile for i386 and x86_64
 # select defconfig based on actual architecture
-KBUILD_DEFCONFIG := $(ARCH)_defconfig
+ifeq ($(ARCH),x86)
        KBUILD_DEFCONFIG := i386_defconfig
 else
        KBUILD_DEFCONFIG := $(ARCH)_defconfig
 endif
-# # No need to remake these files
+# No need to remake these files
 $(srctree)/arch/x86/Makefile%: ;
-ifeq ($(ARCH),i386)
+ifeq ($(CONFIG_X86_32),y)
        include $(srctree)/arch/x86/Makefile_32
 else
        include $(srctree)/arch/x86/Makefile_64
--- a/arch/x86/Makefile_32
+++ b/arch/x86/Makefile_32
@ -160,7 +160,7 @@ archclean:
 	$(Q)$(MAKE) $(clean)=arch/x86/boot
 define archhelp
-  echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
+  echo  '* bzImage	- Compressed kernel image (arch/x86/boot/bzImage)'
  echo  '  install	- Install kernel using'
  echo  '		   (your) ~/bin/installkernel or'
  echo  '		   (distribution) /sbin/installkernel or'
@ -170,6 +170,6 @@ define archhelp
  echo  '  isoimage     - Create a boot CD-ROM image'
 endef
-CLEAN_FILES += arch/$(ARCH)/boot/fdimage \
+CLEAN_FILES += arch/x86/boot/fdimage \
-	       arch/$(ARCH)/boot/image.iso \
+	       arch/x86/boot/image.iso \
-	       arch/$(ARCH)/boot/mtools.conf
+	       arch/x86/boot/mtools.conf
--- a/arch/x86/Makefile_64
+++ b/arch/x86/Makefile_64
@ -127,7 +127,7 @@ archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)
 define archhelp
-  echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
+  echo  '* bzImage	- Compressed kernel image (arch/x86/boot/bzImage)'
  echo  '  install	- Install kernel using'
  echo  '		   (your) ~/bin/installkernel or'
  echo  '		   (distribution) /sbin/installkernel or'
@ -137,8 +137,8 @@ define archhelp
  echo  '  isoimage     - Create a boot CD-ROM image'
 endef
-CLEAN_FILES += arch/$(ARCH)/boot/fdimage \
+CLEAN_FILES += arch/x86/boot/fdimage \
-	       arch/$(ARCH)/boot/image.iso \
+	       arch/x86/boot/image.iso \
-	       arch/$(ARCH)/boot/mtools.conf
+	       arch/x86/boot/mtools.conf
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@ -49,10 +49,10 @@ HOSTCFLAGS_build.o := $(LINUXINCLUDE)
 # How to compile the 16-bit code.  Note we always compile for -march=i386,
 # that way we can complain to the user if the CPU is insufficient.
-cflags-i386   := 
+cflags-$(CONFIG_X86_32) :=
-cflags-x86_64 := -m32
+cflags-$(CONFIG_X86_64) := -m32
 KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
-		   $(cflags-$(ARCH)) \
+		   $(cflags-y) \
 		   -Wall -Wstrict-prototypes \
 		   -march=i386 -mregparm=3 \
 		   -include $(srctree)/$(src)/code16gcc.h \
--- a/arch/x86/boot/cpucheck.c
+++ b/arch/x86/boot/cpucheck.c
@ -42,13 +42,7 @@ static struct cpu_features cpu;
 static u32 cpu_vendor[3];
 static u32 err_flags[NCAPINTS];
 #ifdef CONFIG_X86_64
 static const int req_level = 64;
 #elif defined(CONFIG_X86_MINIMUM_CPU_FAMILY)
 static const int req_level = CONFIG_X86_MINIMUM_CPU_FAMILY;
 #else
 static const int req_level = 3;
 #endif
 static const u32 req_flags[NCAPINTS] =
 {
--- a/arch/x86/kernel/Makefile_32
+++ b/arch/x86/kernel/Makefile_32
@ -3,6 +3,7 @@
 #
 extra-y := head_32.o init_task.o vmlinux.lds
 CPPFLAGS_vmlinux.lds += -Ui386
 obj-y	:= process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
 		ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
@ -60,7 +61,7 @@ quiet_cmd_syscall = SYSCALL $@
      cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \
 		          -Wl,-T,$(filter-out FORCE,$^) -o $@
-export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH)
+export CPPFLAGS_vsyscall_32.lds += -P -C -Ui386
 vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
 		 $(call ld-option, -Wl$(comma)--hash-style=sysv)
--- a/arch/x86/kernel/Makefile_64
+++ b/arch/x86/kernel/Makefile_64
@ -3,7 +3,9 @@
 #
 extra-y 	:= head_64.o head64.o init_task.o vmlinux.lds
 CPPFLAGS_vmlinux.lds += -Ux86_64
 EXTRA_AFLAGS	:= -traditional
 obj-y	:= process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
 		ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \
--- a/arch/x86/kernel/cpu/cpufreq/Kconfig_32
+++ b/arch/x86/kernel/cpu/cpufreq/Kconfig_32
@ -19,6 +19,9 @@ config X86_ACPI_CPUFREQ
 	  Processor Performance States.
 	  This driver also supports Intel Enhanced Speedstep.
 	  To compile this driver as a module, choose M here: the
 	  module will be called acpi-cpufreq.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
 	  If in doubt, say N.
@ -26,7 +29,7 @@ config X86_ACPI_CPUFREQ
 config ELAN_CPUFREQ
 	tristate "AMD Elan SC400 and SC410"
 	select CPU_FREQ_TABLE
-	depends on X86_ELAN
+	depends on X86_32 && X86_ELAN
 	---help---
 	  This adds the CPUFreq driver for AMD Elan SC400 and SC410
 	  processors.
@ -42,7 +45,7 @@ config ELAN_CPUFREQ
 config SC520_CPUFREQ
 	tristate "AMD Elan SC520"
 	select CPU_FREQ_TABLE
-	depends on X86_ELAN
+	depends on X86_32 && X86_ELAN
 	---help---
 	  This adds the CPUFreq driver for AMD Elan SC520 processor.
@ -54,6 +57,7 @@ config SC520_CPUFREQ
 config X86_POWERNOW_K6
 	tristate "AMD Mobile K6-2/K6-3 PowerNow!"
 	select CPU_FREQ_TABLE
 	depends on X86_32
 	help
 	  This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
 	  AMD K6-3+ processors.
@ -65,6 +69,7 @@ config X86_POWERNOW_K6
 config X86_POWERNOW_K7
 	tristate "AMD Mobile Athlon/Duron PowerNow!"
 	select CPU_FREQ_TABLE
 	depends on X86_32
 	help
 	  This adds the CPUFreq driver for mobile AMD K7 mobile processors.
@ -76,23 +81,27 @@ config X86_POWERNOW_K7_ACPI
 	bool
 	depends on X86_POWERNOW_K7 && ACPI_PROCESSOR
 	depends on !(X86_POWERNOW_K7 = y && ACPI_PROCESSOR = m)
 	depends on X86_32
 	default y
 config X86_POWERNOW_K8
 	tristate "AMD Opteron/Athlon64 PowerNow!"
 	select CPU_FREQ_TABLE
 	depends on EXPERIMENTAL
 	help
 	  This adds the CPUFreq driver for mobile AMD Opteron/Athlon64 processors.
 	  To compile this driver as a module, choose M here: the
 	  module will be called powernow-k8.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
 	  If in doubt, say N.
 config X86_POWERNOW_K8_ACPI
-	bool "ACPI Support"
+	bool
-	select ACPI_PROCESSOR
+	prompt "ACPI Support" if X86_32
-	depends on ACPI && X86_POWERNOW_K8
+	depends on ACPI && X86_POWERNOW_K8 && ACPI_PROCESSOR
 	depends on !(X86_POWERNOW_K8 = y && ACPI_PROCESSOR = m)
 	default y
 	help
 	  This provides access to the K8s Processor Performance States via ACPI.
@ -104,7 +113,7 @@ config X86_POWERNOW_K8_ACPI
 config X86_GX_SUSPMOD
 	tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation"
-	depends on PCI
+	depends on X86_32 && PCI
 	help
 	 This add the CPUFreq driver for NatSemi Geode processors which
 	 support suspend modulation.
@ -114,15 +123,20 @@ config X86_GX_SUSPMOD
 	 If in doubt, say N.
 config X86_SPEEDSTEP_CENTRINO
-	tristate "Intel Enhanced SpeedStep"
+	tristate "Intel Enhanced SpeedStep (deprecated)"
 	select CPU_FREQ_TABLE
-	select X86_SPEEDSTEP_CENTRINO_TABLE
+	select X86_SPEEDSTEP_CENTRINO_TABLE if X86_32
 	depends on X86_32 || (X86_64 && ACPI_PROCESSOR)
 	help
 	  This is deprecated and this functionality is now merged into
 	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
 	  speedstep_centrino.
 	  This adds the CPUFreq driver for Enhanced SpeedStep enabled
-	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs. However,
+	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs
-	  you also need to say Y to "Use ACPI tables to decode..." below
+	  or 64bit enabled Intel Xeons.
-	  [which might imply enabling ACPI] if you want to use this driver
+
-	  on non-Banias CPUs.
+	  To compile this driver as a module, choose M here: the
 	  module will be called speedstep-centrino.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
@ -130,7 +144,7 @@ config X86_SPEEDSTEP_CENTRINO
 config X86_SPEEDSTEP_CENTRINO_TABLE
 	bool "Built-in tables for Banias CPUs"
-	depends on X86_SPEEDSTEP_CENTRINO
+	depends on X86_32 && X86_SPEEDSTEP_CENTRINO
 	default y
 	help
 	  Use built-in tables for Banias CPUs if ACPI encoding
@ -141,6 +155,7 @@ config X86_SPEEDSTEP_CENTRINO_TABLE
 config X86_SPEEDSTEP_ICH
 	tristate "Intel Speedstep on ICH-M chipsets (ioport interface)"
 	select CPU_FREQ_TABLE
 	depends on X86_32
 	help
 	  This adds the CPUFreq driver for certain mobile Intel Pentium III
 	  (Coppermine), all mobile Intel Pentium III-M (Tualatin) and all
@ -154,7 +169,7 @@ config X86_SPEEDSTEP_ICH
 config X86_SPEEDSTEP_SMI
 	tristate "Intel SpeedStep on 440BX/ZX/MX chipsets (SMI interface)"
 	select CPU_FREQ_TABLE
-	depends on EXPERIMENTAL
+	depends on X86_32 && EXPERIMENTAL
 	help
 	  This adds the CPUFreq driver for certain mobile Intel Pentium III
 	  (Coppermine), all mobile Intel Pentium III-M (Tualatin)
@ -169,15 +184,24 @@ config X86_P4_CLOCKMOD
 	select CPU_FREQ_TABLE
 	help
 	  This adds the CPUFreq driver for Intel Pentium 4 / XEON
-	  processors.
+	  processors.  When enabled it will lower CPU temperature by skipping
 	  clocks.
 	  This driver should be only used in exceptional
 	  circumstances when very low power is needed because it causes severe
 	  slowdowns and noticeable latencies.  Normally Speedstep should be used
 	  instead.
 	  To compile this driver as a module, choose M here: the
 	  module will be called p4-clockmod.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
-	  If in doubt, say N.
+	  Unless you are absolutely sure say N.
 config X86_CPUFREQ_NFORCE2
 	tristate "nVidia nForce2 FSB changing"
-	depends on EXPERIMENTAL
+	depends on X86_32 && EXPERIMENTAL
 	help
 	  This adds the CPUFreq driver for FSB changing on nVidia nForce2
 	  platforms.
@ -188,6 +212,7 @@ config X86_CPUFREQ_NFORCE2
 config X86_LONGRUN
 	tristate "Transmeta LongRun"
 	depends on X86_32
 	help
 	  This adds the CPUFreq driver for Transmeta Crusoe and Efficeon processors
 	  which support LongRun.
@ -199,7 +224,7 @@ config X86_LONGRUN
 config X86_LONGHAUL
 	tristate "VIA Cyrix III Longhaul"
 	select CPU_FREQ_TABLE
-	depends on ACPI_PROCESSOR
+	depends on X86_32 && ACPI_PROCESSOR
 	help
 	  This adds the CPUFreq driver for VIA Samuel/CyrixIII,
 	  VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T
@ -212,7 +237,7 @@ config X86_LONGHAUL
 config X86_E_POWERSAVER
 	tristate "VIA C7 Enhanced PowerSaver (EXPERIMENTAL)"
 	select CPU_FREQ_TABLE
-	depends on EXPERIMENTAL
+	depends on X86_32 && EXPERIMENTAL
 	help
 	  This adds the CPUFreq driver for VIA C7 processors.
@ -233,11 +258,11 @@ config X86_ACPI_CPUFREQ_PROC_INTF
 config X86_SPEEDSTEP_LIB
 	tristate
-	default X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD
+	default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD)
 config X86_SPEEDSTEP_RELAXED_CAP_CHECK
 	bool "Relaxed speedstep capability checks"
-	depends on (X86_SPEEDSTEP_SMI || X86_SPEEDSTEP_ICH)
+	depends on X86_32 && (X86_SPEEDSTEP_SMI || X86_SPEEDSTEP_ICH)
 	help
 	  Don't perform all checks for a speedstep capable system which would
 	  normally be done. Some ancient or strange systems, though speedstep
--- a/arch/x86/kernel/cpu/cpufreq/Kconfig_64
+++ b/arch/x86/kernel/cpu/cpufreq/Kconfig_64
@ -1,108 +0,0 @@
 #
 # CPU Frequency scaling
 #
 menu "CPU Frequency scaling"
 source "drivers/cpufreq/Kconfig"
 if CPU_FREQ
 comment "CPUFreq processor drivers"
 config X86_POWERNOW_K8
 	tristate "AMD Opteron/Athlon64 PowerNow!"
 	select CPU_FREQ_TABLE
 	help
 	  This adds the CPUFreq driver for mobile AMD Opteron/Athlon64 processors.
 	  To compile this driver as a module, choose M here: the
 	  module will be called powernow-k8.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
 	  If in doubt, say N.
 config X86_POWERNOW_K8_ACPI
 	bool
 	depends on X86_POWERNOW_K8 && ACPI_PROCESSOR
 	depends on !(X86_POWERNOW_K8 = y && ACPI_PROCESSOR = m)
 	default y
 config X86_SPEEDSTEP_CENTRINO
 	tristate "Intel Enhanced SpeedStep (deprecated)"
 	select CPU_FREQ_TABLE
 	depends on ACPI_PROCESSOR
 	help
 	  This is deprecated and this functionality is now merged into
 	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
 	  speedstep_centrino.
 	  This adds the CPUFreq driver for Enhanced SpeedStep enabled
 	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs
 	  or 64bit enabled Intel Xeons.
 	  To compile this driver as a module, choose M here: the
 	  module will be called speedstep-centrino.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
 	  If in doubt, say N.
 config X86_ACPI_CPUFREQ
 	tristate "ACPI Processor P-States driver"
 	select CPU_FREQ_TABLE
 	depends on ACPI_PROCESSOR
 	help
 	  This driver adds a CPUFreq driver which utilizes the ACPI
 	  Processor Performance States.
 	  This driver also supports Intel Enhanced Speedstep.
 	  To compile this driver as a module, choose M here: the
 	  module will be called acpi-cpufreq.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
 	  If in doubt, say N.
 comment "shared options"
 config X86_ACPI_CPUFREQ_PROC_INTF
 	bool "/proc/acpi/processor/../performance interface (deprecated)"
 	depends on PROC_FS
 	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
 	help
 	  This enables the deprecated /proc/acpi/processor/../performance
 	  interface. While it is helpful for debugging, the generic,
 	  cross-architecture cpufreq interfaces should be used.
 	  If in doubt, say N.
 config X86_P4_CLOCKMOD
 	tristate "Intel Pentium 4 clock modulation"
 	depends on EMBEDDED
 	select CPU_FREQ_TABLE
 	help
 	  This adds the clock modulation driver for Intel Pentium 4 / XEON
 	  processors.  When enabled it will lower CPU temperature by skipping
 	  clocks.
 	  This driver should be only used in exceptional
 	  circumstances when very low power is needed because it causes severe
 	  slowdowns and noticeable latencies.  Normally Speedstep should be used
 	  instead.
 	  To compile this driver as a module, choose M here: the
 	  module will be called p4-clockmod.
 	  For details, take a look at <file:Documentation/cpu-freq/>.
 	  Unless you are absolutely sure say N.
 config X86_SPEEDSTEP_LIB
 	tristate
 	default X86_P4_CLOCKMOD
 endif
 endmenu
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@ -20,7 +20,7 @@ quiet_cmd_syscall = SYSCALL $@
      cmd_syscall = $(CC) -m elf_x86_64 -nostdlib $(SYSCFLAGS_$(@F)) \
 		          -Wl,-T,$(filter-out FORCE,$^) -o $@
-export CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
+export CPPFLAGS_vdso.lds += -P -C
 vdso-flags = -fPIC -shared -Wl,-soname=linux-vdso.so.1 \
 		 $(call ld-option, -Wl$(comma)--hash-style=sysv) \
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@ -4,12 +4,7 @@
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
-# If a arch/$(SRCARCH)/Kconfig.$(ARCH) file exist use it
+Kconfig := arch/$(SRCARCH)/Kconfig
 ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/Kconfig.$(ARCH)),)
        Kconfig := arch/$(SRCARCH)/Kconfig.$(ARCH)
 else
        Kconfig := arch/$(SRCARCH)/Kconfig
 endif
 xconfig: $(obj)/qconf
 	$< $(Kconfig)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@ -591,6 +591,7 @@ int main(int ac, char **av)
 			conf_read_simple(name, S_DEF_USER);
 		else if (!stat("all.config", &tmpstat))
 			conf_read_simple("all.config", S_DEF_USER);
 		conf_set_env_sym("K64BIT", "64BIT", S_DEF_USER);
 		break;
 	default:
 		break;
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@ -83,6 +83,95 @@ char *conf_get_default_confname(void)
 	return name;
 }
 static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 {
 	char *p2;
 	switch (sym->type) {
 	case S_TRISTATE:
 		if (p[0] == 'm') {
 			sym->def[def].tri = mod;
 			sym->flags |= def_flags;
 			break;
 		}
 	case S_BOOLEAN:
 		if (p[0] == 'y') {
 			sym->def[def].tri = yes;
 			sym->flags |= def_flags;
 			break;
 		}
 		if (p[0] == 'n') {
 			sym->def[def].tri = no;
 			sym->flags |= def_flags;
 			break;
 		}
 		conf_warning("symbol value '%s' invalid for %s", p, sym->name);
 		break;
 	case S_OTHER:
 		if (*p != '"') {
 			for (p2 = p; *p2 && !isspace(*p2); p2++)
 				;
 			sym->type = S_STRING;
 			goto done;
 		}
 	case S_STRING:
 		if (*p++ != '"')
 			break;
 		for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) {
 			if (*p2 == '"') {
 				*p2 = 0;
 				break;
 			}
 			memmove(p2, p2 + 1, strlen(p2));
 		}
 		if (!p2) {
 			conf_warning("invalid string found");
 			return 1;
 		}
 	case S_INT:
 	case S_HEX:
 	done:
 		if (sym_string_valid(sym, p)) {
 			sym->def[def].val = strdup(p);
 			sym->flags |= def_flags;
 		} else {
 			conf_warning("symbol value '%s' invalid for %s", p, sym->name);
 			return 1;
 		}
 		break;
 	default:
 		;
 	}
 	return 0;
 }
 /* Read an environment variable and assign the value to the symbol */
 int conf_set_env_sym(const char *env, const char *symname, int def)
 {
 	struct symbol *sym;
 	char *p;
 	int def_flags;
 	p = getenv(env);
 	if (p) {
 		char warning[200];
 		sprintf(warning, "Environment variable (%s = \"%s\")", env, p);
 		conf_filename = warning;
 		def_flags = SYMBOL_DEF << def;
 		if (def == S_DEF_USER) {
 			sym = sym_find(symname);
 			if (!sym)
 				return 1;
 		} else {
 			sym = sym_lookup(symname, 0);
 			if (sym->type == S_UNKNOWN)
 				sym->type = S_OTHER;
 		}
 		conf_set_sym_val(sym, def, def_flags, p);
 	}
 	return 0;
 }
 int conf_read_simple(const char *name, int def)
 {
 	FILE *in = NULL;
@ -213,61 +302,8 @@ int conf_read_simple(const char *name, int def)
 				conf_warning("trying to reassign symbol %s", sym->name);
 				break;
 			}
-			switch (sym->type) {
+			if (conf_set_sym_val(sym, def, def_flags, p))
-			case S_TRISTATE:
+				continue;
 				if (p[0] == 'm') {
 					sym->def[def].tri = mod;
 					sym->flags |= def_flags;
 					break;
 				}
 			case S_BOOLEAN:
 				if (p[0] == 'y') {
 					sym->def[def].tri = yes;
 					sym->flags |= def_flags;
 					break;
 				}
 				if (p[0] == 'n') {
 					sym->def[def].tri = no;
 					sym->flags |= def_flags;
 					break;
 				}
 				conf_warning("symbol value '%s' invalid for %s", p, sym->name);
 				break;
 			case S_OTHER:
 				if (*p != '"') {
 					for (p2 = p; *p2 && !isspace(*p2); p2++)
 						;
 					sym->type = S_STRING;
 					goto done;
 				}
 			case S_STRING:
 				if (*p++ != '"')
 					break;
 				for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) {
 					if (*p2 == '"') {
 						*p2 = 0;
 						break;
 					}
 					memmove(p2, p2 + 1, strlen(p2));
 				}
 				if (!p2) {
 					conf_warning("invalid string found");
 					continue;
 				}
 			case S_INT:
 			case S_HEX:
 			done:
 				if (sym_string_valid(sym, p)) {
 					sym->def[def].val = strdup(p);
 					sym->flags |= def_flags;
 				} else {
 					conf_warning("symbol value '%s' invalid for %s", p, sym->name);
 					continue;
 				}
 				break;
 			default:
 				;
 			}
 			break;
 		case '\r':
 		case '\n':
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@ -1,6 +1,7 @@
 /* confdata.c */
 P(conf_parse,void,(const char *name));
 P(conf_set_env_sym,int,(const char *envname, const char *symname, int def));
 P(conf_read,int,(const char *name));
 P(conf_read_simple,int,(const char *name, int));
 P(conf_write,int,(const char *name));