diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-08-20 18:19:24 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-08-20 18:19:24 +0000 |
| commit | 23bb5ee5188adeb6a37b8294c14aff5f4256d8d8 (patch) | |
| tree | 1845e2f2cd87773ad0eca679e2f23bd54be940fe | |
| parent | 6e92cd3227a9d10e90dea2e4f687f1386d706508 (diff) | |
| download | xen-23bb5ee5188adeb6a37b8294c14aff5f4256d8d8.tar.gz xen-23bb5ee5188adeb6a37b8294c14aff5f4256d8d8.tar.bz2 xen-23bb5ee5188adeb6a37b8294c14aff5f4256d8d8.zip | |
bitkeeper revision 1.1159.45.16 (412640acjI6W8MIoA2W2ArmKgPNJcA)
Fix bad migration interaction with /lib/tls emulation code.
| -rw-r--r-- | linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c index 83fec94857..ff56d12631 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c @@ -94,6 +94,13 @@ static void __do_suspend(void) HYPERVISOR_suspend(virt_to_machine(suspend_record) >> PAGE_SHIFT); + HYPERVISOR_vm_assist(VMASST_CMD_enable, + VMASST_TYPE_4gb_segments); +#ifdef CONFIG_XEN_WRITABLE_PAGETABLES + HYPERVISOR_vm_assist(VMASST_CMD_enable, + VMASST_TYPE_writeable_pagetables); +#endif + shutting_down = -1; memcpy(&start_info, &suspend_record->resume_info, sizeof(start_info)); |