diff options
| -rw-r--r-- | xen/arch/x86/x86_64/traps.c | 2 | ||||
| -rw-r--r-- | xen/drivers/char/console.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index ea2ffb644b..1cc977c757 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -227,8 +227,6 @@ void do_double_fault(struct cpu_user_regs *regs) unsigned int cpu; unsigned long crs[8]; - watchdog_disable(); - console_force_unlock(); asm ( "lsll %1, %0" : "=r" (cpu) : "rm" (PER_CPU_GDT_ENTRY << 3) ); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 52ffa70ec2..e47ddf21cc 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -737,6 +737,7 @@ void console_end_log_everything(void) void console_force_unlock(void) { + watchdog_disable(); spin_lock_init(&console_lock); serial_force_unlock(sercon_handle); console_locks_busted = 1; |