From a93f8c6e6e2b699bfbbfa5b34da5eaad0bdec784 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Mon, 21 May 2001 11:49:21 +0000 Subject: [PATCH] Merged from sys/boot/i386/btx/btx/btx.s revision 1.24. --- sys/boot/pc98/btx/btx/btx.S | 8 ++++---- sys/boot/pc98/btx/btx/btx.s | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S index cc8f0f5933c..e8b5e7fe2d6 100644 --- a/sys/boot/pc98/btx/btx/btx.S +++ b/sys/boot/pc98/btx/btx/btx.S @@ -271,14 +271,14 @@ exit: cli # Disable interrupts # Turn off paging. # movl %cr0,%eax # Get CR0 -ifdef(`PAGING',` andl $~0x80000000,%eax # Disable movl %eax,%cr0 # paging -') xorl %ecx,%ecx # Zero -ifdef(`PAGING',` movl %ecx,%cr3 # Flush TLB -') +# +# Restore the GDT in case we caught a kernel trap. +# + lgdt gdtdesc # Set GDT # # To 16 bits. # diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s index cc8f0f5933c..e8b5e7fe2d6 100644 --- a/sys/boot/pc98/btx/btx/btx.s +++ b/sys/boot/pc98/btx/btx/btx.s @@ -271,14 +271,14 @@ exit: cli # Disable interrupts # Turn off paging. # movl %cr0,%eax # Get CR0 -ifdef(`PAGING',` andl $~0x80000000,%eax # Disable movl %eax,%cr0 # paging -') xorl %ecx,%ecx # Zero -ifdef(`PAGING',` movl %ecx,%cr3 # Flush TLB -') +# +# Restore the GDT in case we caught a kernel trap. +# + lgdt gdtdesc # Set GDT # # To 16 bits. #