• Linus Torvalds's avatar
    Merge tag 'stable/for-linus-3.12-rc0-tag-two' of... · a60d4b98
    Linus Torvalds authored
    Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
    
    Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
     "This pull I usually do after rc1 is out but because we have a nice
      amount of fixes, some bootup related fixes for ARM, and it is early in
      the cycle we figured to do it now to help with tracking of potential
      regressions.
    
      The simple ones are the ARM ones - one of the patches fell through the
      cracks, other fixes a bootup issue (unconditionally using Xen
      functions).  Then a fix for a regression causing preempt count being
      off (patch causing this went in v3.12).
    
      Lastly are the fixes to make Xen PVHVM guests use PV ticketlocks (Xen
      PV already does).
    
      The enablement of that was supposed to be part of the x86 spinlock
      merge in commit 816434ec ("The biggest change here are
      paravirtualized ticket spinlocks (PV spinlocks), which bring a nice
      speedup on various benchmarks...") but unfortunatly it would cause
      hang when booting Xen PVHVM guests.  Yours truly got all of the bugs
      fixed last week and they (six of them) are included in this pull.
    
      Bug-fixes:
       - Boot on ARM without using Xen unconditionally
       - On Xen ARM don't run cpuidle/cpufreq
       - Fix regression in balloon driver, preempt count warnings
       - Fixes to make PVHVM able to use pv ticketlock.
       - Revert Xen PVHVM disabling pv ticketlock (aka, re-enable pv ticketlocks)"
    
    * tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
      xen/spinlock: Don't use __initdate for xen_pv_spin
      Revert "xen/spinlock: Disable IRQ spinlock (PV) allocation on PVHVM"
      xen/spinlock: Don't setup xen spinlock IPI kicker if disabled.
      xen/smp: Update pv_lock_ops functions before alternative code starts under PVHVM
      xen/spinlock: We don't need the old structure anymore
      xen/spinlock: Fix locking path engaging too soon under PVHVM.
      xen/arm: disable cpuidle and cpufreq when linux is running as dom0
      xen/p2m: Don't call get_balloon_scratch_page() twice, keep interrupts disabled for multicalls
      ARM: xen: only set pm function ptrs for Xen guests
    a60d4b98
enlighten.c 41.9 KB