diff options
| -rw-r--r-- | xen/arch/x86/shutdown.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 759319103e..be3da89981 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -115,8 +115,6 @@ void machine_restart(unsigned int delay_millisecs) console_start_sync(); spin_debug_disable(); - acpi_dmar_reinstate(); - local_irq_enable(); /* Ensure we are the boot CPU. */ @@ -141,7 +139,10 @@ void machine_restart(unsigned int delay_millisecs) mdelay(delay_millisecs); if ( tboot_in_measured_env() ) + { + acpi_dmar_reinstate(); tboot_shutdown(TB_SHUTDOWN_REBOOT); + } efi_reset_system(reboot_mode != 0); |