diff --git a/[refs] b/[refs]
index 945265cf3665..81c554477dac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c07b0a4b6df45fd8c6d07d838b4faf65eed2ba4
+refs/heads/master: 50eb2a3cd0f50d912b26d0b79b7f443344608390
diff --git a/trunk/arch/ia64/kvm/Kconfig b/trunk/arch/ia64/kvm/Kconfig
index ef3e7be29caf..bf82e47c98bb 100644
--- a/trunk/arch/ia64/kvm/Kconfig
+++ b/trunk/arch/ia64/kvm/Kconfig
@@ -26,6 +26,7 @@ config KVM
 	select ANON_INODES
 	select HAVE_KVM_IRQCHIP
 	select KVM_APIC_ARCHITECTURE
+	select KVM_MMIO
 	---help---
 	  Support hosting fully virtualized guest machines using hardware
 	  virtualization extensions.  You will need a fairly recent
diff --git a/trunk/arch/powerpc/kvm/Kconfig b/trunk/arch/powerpc/kvm/Kconfig
index 6fb6e8aa3890..be28968c7941 100644
--- a/trunk/arch/powerpc/kvm/Kconfig
+++ b/trunk/arch/powerpc/kvm/Kconfig
@@ -20,6 +20,7 @@ config KVM
 	bool
 	select PREEMPT_NOTIFIERS
 	select ANON_INODES
+	select KVM_MMIO
 
 config KVM_BOOK3S_64_HANDLER
 	bool
diff --git a/trunk/arch/x86/kvm/Kconfig b/trunk/arch/x86/kvm/Kconfig
index 4cd498332466..06871111bf54 100644
--- a/trunk/arch/x86/kvm/Kconfig
+++ b/trunk/arch/x86/kvm/Kconfig
@@ -29,6 +29,7 @@ config KVM
 	select HAVE_KVM_EVENTFD
 	select KVM_APIC_ARCHITECTURE
 	select USER_RETURN_NOTIFIER
+	select KVM_MMIO
 	---help---
 	  Support hosting fully virtualized guest machines using hardware
 	  virtualization extensions.  You will need a fairly recent
diff --git a/trunk/virt/kvm/Kconfig b/trunk/virt/kvm/Kconfig
index daece36c0a57..7f1178f6b839 100644
--- a/trunk/virt/kvm/Kconfig
+++ b/trunk/virt/kvm/Kconfig
@@ -12,3 +12,6 @@ config HAVE_KVM_EVENTFD
 
 config KVM_APIC_ARCHITECTURE
        bool
+
+config KVM_MMIO
+       bool