From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 7 May 2012 16:38:51 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~543^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=55e5bebf1646beb288767cc57219fa9919ad58e4;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge

* stable/for-linus-3.4.rebased:
  xen/pci: don't use PCI BIOS service for configuration space accesses
  xen/pte: Fix crashes when trying to see non-existent PGD/PMD/PUD/PTEs
  xen/apic: Return the APIC ID (and version) for CPU 0.
  drivers/video/xen-fbfront.c: add missing cleanup code
  xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'

Conflicts:
	arch/x86/xen/enlighten.c
---

55e5bebf1646beb288767cc57219fa9919ad58e4
diff --cc arch/x86/xen/enlighten.c
index 6192ff18b29e,94cf8df07056..bf28d69672c5
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -63,15 -62,8 +63,16 @@@
  #include <asm/reboot.h>
  #include <asm/stackprotector.h>
  #include <asm/hypervisor.h>
 +#include <asm/mwait.h>
+ #include <asm/pci_x86.h>
  
 +#ifdef CONFIG_ACPI
 +#include <asm/acpi.h>
 +#include <acpi/pdc_intel.h>
 +#include <acpi/processor.h>
 +#include <xen/interface/platform.h>
 +#endif
 +
  #include "xen-ops.h"
  #include "mmu.h"
  #include "multicalls.h"
@@@ -1357,21 -1297,13 +1391,23 @@@ asmlinkage void __init xen_start_kernel
  		if (pci_xen)
  			x86_init.pci.arch_init = pci_xen_init;
  	} else {
 +		const struct dom0_vga_console_info *info =
 +			(void *)((char *)xen_start_info +
 +				 xen_start_info->console.dom0.info_off);
 +
 +		xen_init_vga(info, xen_start_info->console.dom0.info_size);
 +		xen_start_info->console.domU.mfn = 0;
 +		xen_start_info->console.domU.evtchn = 0;
 +
  		/* Make sure ACS will be enabled */
  		pci_request_acs();
 +
 +		xen_acpi_sleep_register();
  	}
- 		
- 
+ #ifdef CONFIG_PCI
+ 	/* PCI BIOS service won't work from a PV guest. */
+ 	pci_probe &= ~PCI_PROBE_BIOS;
+ #endif
  	xen_raw_console_write("about to get started...\n");
  
  	xen_setup_runstate_info(0);