aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/comboot.inc2
-rw-r--r--core/localboot.inc2
-rw-r--r--core/parseconfig.inc4
-rw-r--r--core/writestr.inc3
4 files changed, 6 insertions, 5 deletions
diff --git a/core/comboot.inc b/core/comboot.inc
index aede9de3..40f8817c 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -397,7 +397,7 @@ comapi_nop:
comapi_writestr:
mov ds,P_ES
mov si,P_BX
- call writestr_early
+ call writestr
clc
ret
diff --git a/core/localboot.inc b/core/localboot.inc
index 62822570..ae54737a 100644
--- a/core/localboot.inc
+++ b/core/localboot.inc
@@ -30,7 +30,7 @@ local_boot:
mov fs,dx
mov gs,dx
mov si,localboot_msg
- call writestr_early
+ call writestr
cmp ax,-1
je .int18
diff --git a/core/parseconfig.inc b/core/parseconfig.inc
index dfd380f7..2ef9c3a2 100644
--- a/core/parseconfig.inc
+++ b/core/parseconfig.inc
@@ -328,7 +328,7 @@ pc_label: call commit_vk ; Commit any current vkernel
; "say" command
;
pc_say: call pc_getline ; "say" command
- call writestr_early
+ call writestr
jmp crlf ; tailcall
;
@@ -410,7 +410,7 @@ commit_vk:
ret
.overflow:
mov si,vk_overflow_msg
- call writestr_early
+ call writestr
ret
section .data
diff --git a/core/writestr.inc b/core/writestr.inc
index 65e37c96..4adc6bf4 100644
--- a/core/writestr.inc
+++ b/core/writestr.inc
@@ -32,7 +32,8 @@ crlf: push ax
; writestr: write a null-terminated string to the console, saving
; registers on entry.
;
-; Note: writestr_early and writestr are distinct in SYSLINUX (only)
+; Note: writestr_early and writestr are distinct in
+; SYSLINUX and EXTLINUX, but not PXELINUX and ISOLINUX
;
writestr:
pushfd