diff options
| author | nyan <nyan@FreeBSD.org> | 2001-05-21 11:49:21 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2001-05-21 11:49:21 +0000 |
| commit | 9fa80b3cce8e7f416156ab6607cb90886bebe079 (patch) | |
| tree | 7f032b2cc1c89cf77ccb69344f8df98a35d11a7c /sys/boot | |
| parent | ba9e8fc1f60289f750ecec23bac9e0a1cf6003e1 (diff) | |
| download | FreeBSD-src-9fa80b3cce8e7f416156ab6607cb90886bebe079.zip FreeBSD-src-9fa80b3cce8e7f416156ab6607cb90886bebe079.tar.gz | |
Merged from sys/boot/i386/btx/btx/btx.s revision 1.24.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/pc98/btx/btx/btx.S | 8 | ||||
| -rw-r--r-- | 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 cc8f0f5..e8b5e7f 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 cc8f0f5..e8b5e7f 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. # |
