tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6

* 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6:
xen: fix hang on suspend.

Linus Torvalds 4f374425 004b3506

+4 -4
unified split
+4 -4
drivers/xen/manage.c
··· 102 goto out_thaw; 103 } 104 105 err = dpm_suspend_noirq(PMSG_SUSPEND); 106 if (err) { 107 printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err); 108 goto out_resume; 109 } 110 - 111 - printk(KERN_DEBUG "suspending xenstore...\n"); 112 - xs_suspend(); 113 114 err = stop_machine(xen_suspend, &cancelled, cpumask_of(0)); 115 ··· 120 cancelled = 1; 121 } 122 123 if (!cancelled) { 124 xen_arch_resume(); 125 xs_resume(); 126 } else 127 xs_suspend_cancel(); 128 129 - out_resume: 130 dpm_resume_end(PMSG_RESUME); 131 132 /* Make sure timer events get retriggered on all CPUs */
··· 102 goto out_thaw; 103 } 104 105 + printk(KERN_DEBUG "suspending xenstore...\n"); 106 + xs_suspend(); 107 + 108 err = dpm_suspend_noirq(PMSG_SUSPEND); 109 if (err) { 110 printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err); 111 goto out_resume; 112 } 113 114 err = stop_machine(xen_suspend, &cancelled, cpumask_of(0)); 115 ··· 120 cancelled = 1; 121 } 122 123 + out_resume: 124 if (!cancelled) { 125 xen_arch_resume(); 126 xs_resume(); 127 } else 128 xs_suspend_cancel(); 129 130 dpm_resume_end(PMSG_RESUME); 131 132 /* Make sure timer events get retriggered on all CPUs */