diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
| commit | 05cd2544f4b64d9a9eca0d170191867495e01feb (patch) | |
| tree | 10146fb79bba464bac6f620d03b8cd50285065b7 /drivers/xen/manage.c | |
| parent | 27f680adc65ca08bf72ed85d3a48d1ee70f77c7a (diff) | |
| parent | a0601c8944dc08c2d349c24bd9c0b09c406229fc (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/xen/manage.c')
| -rw-r--r-- | drivers/xen/manage.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index d0e87cbe157c..9b91617b9582 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c | |||
| @@ -39,8 +39,6 @@ static int xen_suspend(void *data) | |||
| 39 | 39 | ||
| 40 | BUG_ON(!irqs_disabled()); | 40 | BUG_ON(!irqs_disabled()); |
| 41 | 41 | ||
| 42 | load_cr3(swapper_pg_dir); | ||
| 43 | |||
| 44 | err = device_power_down(PMSG_SUSPEND); | 42 | err = device_power_down(PMSG_SUSPEND); |
| 45 | if (err) { | 43 | if (err) { |
| 46 | printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n", | 44 | printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n", |