Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6 (4f374425) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/xen/manage.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -102,15 +102,15 @@ static void do_suspend(void)
		goto out_thaw;
		}

		printk(KERN_DEBUG "suspending xenstore...\n");
		xs_suspend();

		err = dpm_suspend_noirq(PMSG_SUSPEND);
		if (err) {
		printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
		goto out_resume;
		}

		printk(KERN_DEBUG "suspending xenstore...\n");
		xs_suspend();

		err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));

		dpm_resume_noirq(PMSG_RESUME);
		@@ -120,13 +120,13 @@ static void do_suspend(void)
		cancelled = 1;
		}

		out_resume:
		if (!cancelled) {
		xen_arch_resume();
		xs_resume();
		} else
		xs_suspend_cancel();

		out_resume:
		dpm_resume_end(PMSG_RESUME);

		/* Make sure timer events get retriggered on all CPUs */