Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

* 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen: try harder to balloon up under memory pressure.
  Xen balloon: fix totalram_pages counting.
  xen: explicitly create/destroy stop_machine workqueues outside suspend/resume region.
  xen: improve error handling in do_suspend.
  xen: don't leak IRQs over suspend/resume.
  xen: call clock resume notifier on all CPUs
  xen: use iret for return from 64b kernel to 32b usermode
  xen: don't call dpm_resume_noirq() with interrupts disabled.
  xen: register runstate info for boot CPU early
  xen: register runstate on secondary CPUs
  xen: register timer interrupt with IRQF_TIMER
  xen: correctly restore pfn_to_mfn_list_list after resume
  xen: restore runstate_info even if !have_vcpu_info_placement
  xen: re-register runstate area earlier on resume.
  xen: wait up to 5 minutes for device connetion
  xen: improvement to wait_for_devices()
  xen: fix is_disconnected_device/exists_disconnected_device
  xen/xenbus: make DEVICE_ATTR()s static

1 files changed, 14 insertions, 13 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index c462cea8ef09..b8e45f164e2a 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -138,24 +138,23 @@ static void xen_vcpu_setup(int cpu)
  */
 void xen_vcpu_restore(void)
 {
-        if (have_vcpu_info_placement) {
-                int cpu;
+        int cpu;
 
-                for_each_online_cpu(cpu) {
-                        bool other_cpu = (cpu != smp_processor_id());
+        for_each_online_cpu(cpu) {
+                bool other_cpu = (cpu != smp_processor_id());
 
-                        if (other_cpu &&
-                            HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL))
-                                BUG();
+                if (other_cpu &&
+                    HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL))
+                        BUG();
 
-                        xen_vcpu_setup(cpu);
+                xen_setup_runstate_info(cpu);
 
-                        if (other_cpu &&
-                            HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL))
-                                BUG();
-                }
+                if (have_vcpu_info_placement)
+                        xen_vcpu_setup(cpu);
 
-                BUG_ON(!have_vcpu_info_placement);
+                if (other_cpu &&
+                    HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL))
+                        BUG();
         }
 }
 
@@ -1180,6 +1179,8 @@ asmlinkage void __init xen_start_kernel(void)
 
         xen_raw_console_write("about to get started...\n");
 
+        xen_setup_runstate_info(0);
+
         /* Start the world */
 #ifdef CONFIG_X86_32
         i386_start_kernel();