Merge branch 'stable/bug.fixes' into linux-next

* stable/bug.fixes:
  xen/i386: follow-up to "replace order-based range checking of M2P table by linear one"
  xen/irq: Alter the locking to use a mutex instead of a spinlock.
  xen/e820: if there is no dom0_mem=, don't tweak extra_pages.
  xen: disable PV spinlocks on HVM

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc drivers/xen/events.c
index 289460d2796253bd152e16949c86a4d0361ff818,7523719bf8a4aab4dadfeb063151958bff9a0d45..a54fc6f2026f76fd7e060e64d6369cfec27002f8
--- 1/drivers/xen/events.c
--- 2/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@@ -896,9 -876,9 +896,9 @@@ static int find_virq(unsigned int virq
  int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
  {
        struct evtchn_bind_virq bind_virq;
 -      int evtchn, irq;
 +      int evtchn, irq, ret;
  
-       spin_lock(&irq_mapping_update_lock);
+       mutex_lock(&irq_mapping_update_lock);
  
        irq = per_cpu(virq_to_irq, cpu)[virq];