diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
| commit | 26e20a108caca6231c6a5ec659f815a866904751 (patch) | |
| tree | 36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /drivers/xen/manage.c | |
| parent | 691513f70d3957939a318da970987b876c720861 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into x86/security
Diffstat (limited to 'drivers/xen/manage.c')
| -rw-r--r-- | drivers/xen/manage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index ef9c7db52077..db8c4c4ac880 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c | |||
| @@ -49,6 +49,7 @@ static int xen_hvm_suspend(void *data) | |||
| 49 | 49 | ||
| 50 | if (!*cancelled) { | 50 | if (!*cancelled) { |
| 51 | xen_irq_resume(); | 51 | xen_irq_resume(); |
| 52 | xen_console_resume(); | ||
| 52 | xen_timer_resume(); | 53 | xen_timer_resume(); |
| 53 | } | 54 | } |
| 54 | 55 | ||