diff options
author | hpa <hpa> | 1998-02-27 04:21:34 +0000 |
---|---|---|
committer | hpa <hpa> | 1998-02-27 04:21:34 +0000 |
commit | 92da01994a20dbfb7aabb134482f1850b7717c5b (patch) | |
tree | b76bc3984346294fbd5202b08399cda7bdd2fbc2 | |
parent | 1809a6cc92f77ad4ff676ce10fe8e24cc432cbae (diff) | |
download | syslinux.git-syslinux-1.33.tar.gz syslinux.git-syslinux-1.33.tar.xz syslinux.git-syslinux-1.33.zip |
Deleted vestiges of old WBINVD codesyslinux-1.33
-rw-r--r-- | ldlinux.asm | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/ldlinux.asm b/ldlinux.asm index d523ff78..31c318fa 100644 --- a/ldlinux.asm +++ b/ldlinux.asm @@ -1045,31 +1045,6 @@ enough_ram: skip_checks: ; -; We still need to check if this is a 486 or higher, and if it isn't, blank -; out the WBINVD subroutine -; -%if 0 - pushfd - pushfd - pop eax - mov ebx,eax - xor eax,(1 << 18) ; Toggle EFLAGS.AC - push eax - popfd - pushfd - pop eax - popfd - cmp eax,ebx - jne is_486 ; Is a 486 or higher, assume WBINVD works - mov word [flush_cache.wbinvd],09090h ; NOP out -is_486: -%else - -%define wbinvd nop - -%endif - -; ; Initialization that does not need to go into the any of the pre-load ; areas ; @@ -2003,10 +1978,9 @@ bcopy: ; Routines to enable and disable (yuck) A20 ; These routines are largely cut-and-paste from the Linux setup code ; -%define io_delay out 0EDh, ax ; Invalid port +%define io_delay out 0EDh, ax ; Invalid port (we hope) enable_a20: - call flush_cache call empty_8042 mov al,0D1h ; Command write out 064h, al @@ -2022,7 +1996,6 @@ kbc_delay: call empty_8042 ret disable_a20: - call flush_cache call empty_8042 mov al,0D1h out 064h, al ; Command write @@ -2045,10 +2018,6 @@ empty_8042: io_delay ret -flush_cache: -.wbinvd: wbinvd ; Gets NOP'd out on a 386 - ret - ; ; Load RAM disk into high memory ; |