diff options
| -rw-r--r-- | arch/i386/boot/bootsect.S | 2 | ||||
| -rw-r--r-- | arch/i386/boot/video.S | 18 | ||||
| -rw-r--r-- | arch/x86_64/boot/bootsect.S | 4 | 
3 files changed, 12 insertions, 12 deletions
diff --git a/arch/i386/boot/bootsect.S b/arch/i386/boot/bootsect.S index ba9fe14db6a9..011b7a4993d4 100644 --- a/arch/i386/boot/bootsect.S +++ b/arch/i386/boot/bootsect.S  | |||
| @@ -83,7 +83,7 @@ bugger_off_msg: | |||
| 83 | .ascii "\n" | 83 | .ascii "\n" | 
| 84 | .ascii "Remove disk and press any key to reboot . . .\r\n" | 84 | .ascii "Remove disk and press any key to reboot . . .\r\n" | 
| 85 | .byte 0 | 85 | .byte 0 | 
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | # Kernel attributes; used by setup | 88 | # Kernel attributes; used by setup | 
| 89 | 89 | ||
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S index 925d3f5a3824..0587477c99f2 100644 --- a/arch/i386/boot/video.S +++ b/arch/i386/boot/video.S  | |||
| @@ -1924,36 +1924,36 @@ skip10: movb %ah, %al | |||
| 1924 | ret | 1924 | ret | 
| 1925 | 1925 | ||
| 1926 | store_edid: | 1926 | store_edid: | 
| 1927 | pushw %es # just save all registers | 1927 | pushw %es # just save all registers | 
| 1928 | pushw %ax | 1928 | pushw %ax | 
| 1929 | pushw %bx | 1929 | pushw %bx | 
| 1930 | pushw %cx | 1930 | pushw %cx | 
| 1931 | pushw %dx | 1931 | pushw %dx | 
| 1932 | pushw %di | 1932 | pushw %di | 
| 1933 | 1933 | ||
| 1934 | pushw %fs | 1934 | pushw %fs | 
| 1935 | popw %es | 1935 | popw %es | 
| 1936 | 1936 | ||
| 1937 | movl $0x13131313, %eax # memset block with 0x13 | 1937 | movl $0x13131313, %eax # memset block with 0x13 | 
| 1938 | movw $32, %cx | 1938 | movw $32, %cx | 
| 1939 | movw $0x140, %di | 1939 | movw $0x140, %di | 
| 1940 | cld | 1940 | cld | 
| 1941 | rep | 1941 | rep | 
| 1942 | stosl | 1942 | stosl | 
| 1943 | 1943 | ||
| 1944 | movw $0x4f15, %ax # do VBE/DDC | 1944 | movw $0x4f15, %ax # do VBE/DDC | 
| 1945 | movw $0x01, %bx | 1945 | movw $0x01, %bx | 
| 1946 | movw $0x00, %cx | 1946 | movw $0x00, %cx | 
| 1947 | movw $0x01, %dx | 1947 | movw $0x01, %dx | 
| 1948 | movw $0x140, %di | 1948 | movw $0x140, %di | 
| 1949 | int $0x10 | 1949 | int $0x10 | 
| 1950 | 1950 | ||
| 1951 | popw %di # restore all registers | 1951 | popw %di # restore all registers | 
| 1952 | popw %dx | 1952 | popw %dx | 
| 1953 | popw %cx | 1953 | popw %cx | 
| 1954 | popw %bx | 1954 | popw %bx | 
| 1955 | popw %ax | 1955 | popw %ax | 
| 1956 | popw %es | 1956 | popw %es | 
| 1957 | ret | 1957 | ret | 
| 1958 | 1958 | ||
| 1959 | # VIDEO_SELECT-only variables | 1959 | # VIDEO_SELECT-only variables | 
diff --git a/arch/x86_64/boot/bootsect.S b/arch/x86_64/boot/bootsect.S index bb15d406ee95..011b7a4993d4 100644 --- a/arch/x86_64/boot/bootsect.S +++ b/arch/x86_64/boot/bootsect.S  | |||
| @@ -63,7 +63,7 @@ msg_loop: | |||
| 63 | jz die | 63 | jz die | 
| 64 | movb $0xe, %ah | 64 | movb $0xe, %ah | 
| 65 | movw $7, %bx | 65 | movw $7, %bx | 
| 66 | int $0x10 | 66 | int $0x10 | 
| 67 | jmp msg_loop | 67 | jmp msg_loop | 
| 68 | 68 | ||
| 69 | die: | 69 | die: | 
| @@ -71,7 +71,7 @@ die: | |||
| 71 | xorw %ax, %ax | 71 | xorw %ax, %ax | 
| 72 | int $0x16 | 72 | int $0x16 | 
| 73 | int $0x19 | 73 | int $0x19 | 
| 74 | 74 | ||
| 75 | # int 0x19 should never return. In case it does anyway, | 75 | # int 0x19 should never return. In case it does anyway, | 
| 76 | # invoke the BIOS reset code... | 76 | # invoke the BIOS reset code... | 
| 77 | ljmp $0xf000,$0xfff0 | 77 | ljmp $0xf000,$0xfff0 | 
