aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-09-04 15:47:51 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-09-04 15:47:51 -0700
commit4d5ca62c83c6c75d8ff28549cd8e620ce127deff (patch)
treee2a7991f39ca897d4e440f48b742148b4cae9cff
parent008ead804c5ed99546c25667fda56d66178eefb8 (diff)
parent517edd4527b9b4bd33aa18c8c6edecf20a9a992f (diff)
downloadlwip-4d5ca62c83c6c75d8ff28549cd8e620ce127deff.tar.gz
lwip-4d5ca62c83c6c75d8ff28549cd8e620ce127deff.tar.xz
lwip-4d5ca62c83c6c75d8ff28549cd8e620ce127deff.zip
Merge branch 'master' into fsc
-rw-r--r--core/localboot.inc3
-rw-r--r--core/pxelinux.asm1
-rw-r--r--core/runkernel.inc2
3 files changed, 6 insertions, 0 deletions
diff --git a/core/localboot.inc b/core/localboot.inc
index 3fee7d62..78483463 100644
--- a/core/localboot.inc
+++ b/core/localboot.inc
@@ -31,6 +31,9 @@ local_boot:
mov gs,dx
mov si,localboot_msg
call writestr
+ push ax
+ call cleanup_hardware
+ pop ax
cmp ax,-1
je .int18
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 00b780b7..1ebd2b5e 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -301,6 +301,7 @@ local_boot:
mov si,localboot_msg
call writestr_early
; Restore the environment we were called with
+ call cleanup_hardware
lss sp,[InitStack]
pop gs
pop fs
diff --git a/core/runkernel.inc b/core/runkernel.inc
index 68ab9fac..893c41c0 100644
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -461,6 +461,8 @@ run_linux_kernel:
; Set up segment registers and the Linux real-mode stack
; Note: ds == the real mode segment
;
+ call cleanup_hardware
+
cli
mov ax,ds
mov ss,ax