Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f374425 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 004b3506 c5cae661

drivers/xen/manage.c

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

		goto out_thaw;

	}

	}





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

	xs_suspend();



	err = dpm_suspend_noirq(PMSG_SUSPEND);

	err = dpm_suspend_noirq(PMSG_SUSPEND);

	if (err) {

	if (err) {

		printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);

		printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);

		goto out_resume;

		goto out_resume;

	}

	}





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

	xs_suspend();



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

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





	dpm_resume_noirq(PMSG_RESUME);

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

		cancelled = 1;

	}

	}





out_resume:

	if (!cancelled) {

	if (!cancelled) {

		xen_arch_resume();

		xen_arch_resume();

		xs_resume();

		xs_resume();

	} else

	} else

		xs_suspend_cancel();

		xs_suspend_cancel();





out_resume:

	dpm_resume_end(PMSG_RESUME);

	dpm_resume_end(PMSG_RESUME);





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

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