diff options
| author | nyan <nyan@FreeBSD.org> | 1999-11-03 08:32:03 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 1999-11-03 08:32:03 +0000 |
| commit | 3415a19e364c9849763fdd543470df6bceb4baf4 (patch) | |
| tree | b2c1a1c7219710c128378c51498939e91edf96dc /sys/boot | |
| parent | 8b1b01b07c43fcafe34037c578ebc8b9cc24e0f1 (diff) | |
| download | FreeBSD-src-3415a19e364c9849763fdd543470df6bceb4baf4.zip FreeBSD-src-3415a19e364c9849763fdd543470df6bceb4baf4.tar.gz | |
Sync with sys/boot/i386/btx/btx/btx.s revision 1.13.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/pc98/btx/btx/btx.S | 5 | ||||
| -rw-r--r-- | sys/boot/pc98/btx/btx/btx.s | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S index 75b2942..944c1aa 100644 --- a/sys/boot/pc98/btx/btx/btx.S +++ b/sys/boot/pc98/btx/btx/btx.S @@ -211,8 +211,13 @@ ifdef(`PAGING',` ') lgdtwm(gdtdesc) # Set GDT movl %cr0,%eax # Switch to +ifdef(`PAGING',` + o16 # protected mode + orl $0x80000001,%eax # and enable paging +',` o16 # protected mode orl $0x01,%eax # +') movl %eax,%cr0 # jmpfwi(SEL_SCODE,init.8) # To 32-bit code init.8: xorl %ecx,%ecx # Zero diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s index 75b2942..944c1aa 100644 --- a/sys/boot/pc98/btx/btx/btx.s +++ b/sys/boot/pc98/btx/btx/btx.s @@ -211,8 +211,13 @@ ifdef(`PAGING',` ') lgdtwm(gdtdesc) # Set GDT movl %cr0,%eax # Switch to +ifdef(`PAGING',` + o16 # protected mode + orl $0x80000001,%eax # and enable paging +',` o16 # protected mode orl $0x01,%eax # +') movl %eax,%cr0 # jmpfwi(SEL_SCODE,init.8) # To 32-bit code init.8: xorl %ecx,%ecx # Zero |
