Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen bug fixes from David Vrabel.

* tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: use same main loop for counting and remapping pages
  xen/events: Don't move disabled irqs
  xen/x86: actually allocate legacy interrupts on PV guests
  Xen: don't warn about 2-byte wchar_t in efi
  xen/gntdev: reduce copy batch size to 16
  xen/x86: don't lose event interrupts

diff --combined arch/x86/pci/xen.c
index 4bd08b0,349b8ce..99ddab7
--- 1/arch/x86/pci/xen.c
--- 2/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@@ -445,7 -445,7 +445,7 @@@ void __init xen_msi_init(void
                uint32_t eax = cpuid_eax(xen_cpuid_base() + 4);
  
                if (((eax & XEN_HVM_CPUID_X2APIC_VIRT) && x2apic_mode) ||
 -                  ((eax & XEN_HVM_CPUID_APIC_ACCESS_VIRT) && cpu_has_apic))
 +                  ((eax & XEN_HVM_CPUID_APIC_ACCESS_VIRT) && boot_cpu_has(X86_FEATURE_APIC)))
                        return;
        }
  
@@@ -491,8 -491,11 +491,11 @@@ int __init pci_xen_initial_domain(void
  #endif
        __acpi_register_gsi = acpi_register_gsi_xen;
        __acpi_unregister_gsi = NULL;
-       /* Pre-allocate legacy irqs */
-       for (irq = 0; irq < nr_legacy_irqs(); irq++) {
+       /*
+        * Pre-allocate the legacy IRQs.  Use NR_LEGACY_IRQS here
+        * because we don't have a PIC and thus nr_legacy_irqs() is zero.
+        */
+       for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
                int trigger, polarity;
  
                if (acpi_get_override_irq(irq, &trigger, &polarity) == -1)