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

Pull x86 platform updates from Ingo Molnar:
 "Two changes:

   - A Kconfig dependency fix/cleanup

   - Introduce the 'make kvmconfig' KVM configuration helper utility
     that turns the current .config into a KVM-bootable config.  Useful
     for debugging specific native kernel configs that have no KVM
     config options enabled on VM setups."

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform: Make X86_GOLDFISH depend on X86_EXTENDED_PLATFORM
  x86/platform: Add kvmconfig to the phony targets
  x86, platform, kvm, kconfig: Turn existing .config's into KVM-capable configs

diff --combined arch/x86/Kconfig
index 34d1db1e7f4026aab0dfebb370bd37d50af9a0d4,9359d23e6a535b84230aad23713477e02896250b..d98b665e6536ad03552abcdd648d5fa02f69e60b
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -336,6 -336,7 +336,7 @@@ config X86_EXTENDED_PLATFOR
  
          If you enable this option then you'll be able to select support
          for the following (non-PC) 32 bit x86 platforms:
+               Goldfish (Android emulator)
                AMD Elan
                NUMAQ (IBM/Sequent)
                RDC R-321x SoC
@@@ -410,6 -411,7 +411,7 @@@ config X86_U
  config X86_GOLDFISH
         bool "Goldfish (Virtual Platform)"
         depends on X86_32
+        depends on X86_EXTENDED_PLATFORM
         ---help---
         Enable support for the Goldfish virtual platform used primarily
         for Android development. Unless you are building for the Android
@@@ -1058,16 -1060,8 +1060,16 @@@ config MICROCODE_INTEL_LI
        depends on MICROCODE_INTEL
  
  config MICROCODE_INTEL_EARLY
 +      def_bool n
 +
 +config MICROCODE_AMD_EARLY
 +      def_bool n
 +
 +config MICROCODE_EARLY
        bool "Early load microcode"
 -      depends on MICROCODE_INTEL && BLK_DEV_INITRD
 +      depends on MICROCODE=y && BLK_DEV_INITRD
 +      select MICROCODE_INTEL_EARLY if MICROCODE_INTEL
 +      select MICROCODE_AMD_EARLY if MICROCODE_AMD
        default y
        help
          This option provides functionality to read additional microcode data
@@@ -1075,6 -1069,10 +1077,6 @@@
          microcode to CPU's as early as possible. No functional change if no
          microcode data is glued to the initrd, therefore it's safe to say Y.
  
 -config MICROCODE_EARLY
 -      def_bool y
 -      depends on MICROCODE_INTEL_EARLY
 -
  config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        ---help---
@@@ -1729,7 -1727,7 +1731,7 @@@ config PHYSICAL_ALIG
  
  config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
 -      depends on SMP && HOTPLUG
 +      depends on SMP
        ---help---
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.
@@@ -2269,7 -2267,6 +2271,7 @@@ source "fs/Kconfig.binfmt
  config IA32_EMULATION
        bool "IA32 Emulation"
        depends on X86_64
 +      select BINFMT_ELF
        select COMPAT_BINFMT_ELF
        select HAVE_UID16
        ---help---