Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 382d72a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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"
parents ac73e08e 5140a6f4

arch/x86/hyperv/hv_apic.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 */



#include <linux/types.h>

#include <linux/version.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>

#include <linux/clockchips.h>

arch/x86/hyperv/hv_init.c

+19 −0
Original line number Diff line number Diff line
@@ -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.

	 */