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

Pull x86 hyperv updates from Ingo Molnar:
 "Two small changes: a boot warning removal and a minor cleanup"

* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/hyperv: Remove unused include
  x86/hyperv: Suppress "PCI: Fatal: No config space access function found"

diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c
index 2c43e3055948e8b7927083138c01e311e1ea77e5..8eb6fbee8e135fdc9861c7a998fcbb11ca4e4077 100644 (file)
--- a/arch/x86/hyperv/hv_apic.c
+++ b/arch/x86/hyperv/hv_apic.c
@@ -20,7 +20,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 #include <linux/clockchips.h>

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 20c876c7c5bf08ac6ea5aad0f956daae557339f2..7abb09e2eeb819129c6e9bcbbc1a3408e3e59c95 100644 (file)
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include <linux/efi.h>
 #include <linux/types.h>
 #include <asm/apic.h>
 #include <asm/desc.h>
@@ -253,6 +254,22 @@ static int hv_cpu_die(unsigned int cpu)
        return 0;
 }
 
+static int __init hv_pci_init(void)
+{
+       int gen2vm = efi_enabled(EFI_BOOT);
+
+       /*
+        * For Generation-2 VM, we exit from pci_arch_init() by returning 0.
+        * The purpose is to suppress the harmless warning:
+        * "PCI: Fatal: No config space access function found"
+        */
+       if (gen2vm)
+               return 0;
+
+       /* For Generation-1 VM, we'll proceed in pci_arch_init().  */
+       return 1;
+}
+
 /*
  * This function is to be invoked early in the boot sequence after the
  * hypervisor has been detected.
@@ -329,6 +346,8 @@ void __init hyperv_init(void)
 
        hv_apic_init();
 
+       x86_init.pci.arch_init = hv_pci_init;
+
        /*
         * Register Hyper-V specific clocksource.
         */