From: Konrad Rzeszutek Wilk Date: Mon, 7 May 2012 21:00:12 +0000 (-0400) Subject: Merge branch 'stable/for-linus-3.5' into linux-next X-Git-Tag: next-20120724~28^2~16 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a3fda18c8ecdd56de23e4ecf789b1a26b8030b8;p=karo-tx-linux.git Merge branch 'stable/for-linus-3.5' into linux-next * stable/for-linus-3.5: xen: enter/exit lazy_mmu_mode around m2p_override calls xen/acpi/sleep: Enable ACPI sleep via the __acpi_os_prepare_sleep xen: implement IRQ_WORK_VECTOR handler xen: implement apic ipi interface xen/setup: update VA mapping when releasing memory during setup xen/setup: Combine the two hypercall functions - since they are quite similar. xen/setup: Populate freed MFNs from non-RAM E820 entries and gaps to E820 RAM xen/setup: Only print "Freeing XXX-YYY pfn range: Z pages freed" if Z > 0 xen/p2m: An early bootup variant of set_phys_to_machine xen/p2m: Collapse early_alloc_p2m_middle redundant checks. xen/p2m: Allow alloc_p2m_middle to call reserve_brk depending on argument xen/p2m: Move code around to allow for better re-usage. Conflicts: arch/x86/xen/enlighten.c --- 4a3fda18c8ecdd56de23e4ecf789b1a26b8030b8 diff --cc arch/x86/xen/enlighten.c index 95dccce8e979,d1f9a0472d44..f9b6f3060cb5 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@@ -881,8 -851,14 +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 @@@ -1398,11 -1373,11 +1407,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);