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

Commit a5bbef0b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6:
  xen: suspend and resume system devices when running PVHVM
parents bc3adfc6 8dd38383

drivers/xen/manage.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -37,11 +37,19 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID; 
#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

static int xen_hvm_suspend(void *data)

static int xen_hvm_suspend(void *data)

{

{

	int err;

	struct sched_shutdown r = { .reason = SHUTDOWN_suspend };

	struct sched_shutdown r = { .reason = SHUTDOWN_suspend };

	int *cancelled = data;

	int *cancelled = data;





	BUG_ON(!irqs_disabled());

	BUG_ON(!irqs_disabled());





	err = sysdev_suspend(PMSG_SUSPEND);

	if (err) {

		printk(KERN_ERR "xen_hvm_suspend: sysdev_suspend failed: %d\n",

		       err);

		return err;

	}



	*cancelled = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);

	*cancelled = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);





	xen_hvm_post_suspend(*cancelled);

	xen_hvm_post_suspend(*cancelled);
@@ -53,6 +61,8 @@ static int xen_hvm_suspend(void *data) 
		xen_timer_resume();

		xen_timer_resume();

	}

	}





	sysdev_resume();



	return 0;

	return 0;

}

}