From: Konrad Rzeszutek Wilk Date: Mon, 7 May 2012 16:29:26 +0000 (-0400) Subject: Merge branch 'stable/for-linus-3.4' into linux-next X-Git-Tag: next-20120724~28^2~23 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2f5d45bb6edf541ae96555d03432d3bc13ba5658;p=karo-tx-linux.git Merge branch 'stable/for-linus-3.4' into linux-next * stable/for-linus-3.4: xen/Kconfig: fix Kconfig layout 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 Conflicts: arch/x86/xen/enlighten.c --- 2f5d45bb6edf541ae96555d03432d3bc13ba5658 diff --cc arch/x86/xen/enlighten.c index 9162920ded44,95dccce8e979..278e7aced20e --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@@ -851,14 -881,8 +883,16 @@@ static void set_xen_basic_apic_ops(void apic->icr_write = xen_apic_icr_write; apic->wait_icr_idle = xen_apic_wait_icr_idle; apic->safe_wait_icr_idle = xen_safe_apic_wait_icr_idle; + apic->set_apic_id = xen_set_apic_id; + apic->get_apic_id = xen_get_apic_id; + +#ifdef CONFIG_SMP + apic->send_IPI_allbutself = xen_send_IPI_allbutself; + apic->send_IPI_mask_allbutself = xen_send_IPI_mask_allbutself; + apic->send_IPI_mask = xen_send_IPI_mask; + apic->send_IPI_all = xen_send_IPI_all; + apic->send_IPI_self = xen_send_IPI_self; +#endif } #endif @@@ -1374,11 -1398,11 +1408,13 @@@ asmlinkage void __init xen_start_kernel /* 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);