From ad620f4fc965a205a5bfa94b6d083c47551491b3 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@centraldogma>
Date: Fri, 11 Nov 2011 09:21:53 +0100
Subject: 9boot: fix more e820

---
 sys/src/boot/pc/e820.s | 2 ++
 sys/src/boot/pc/sub.c  | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/src/boot/pc/e820.s b/sys/src/boot/pc/e820.s
index 71db6c53d..370861c9f 100644
--- a/sys/src/boot/pc/e820.s
+++ b/sys/src/boot/pc/e820.s
@@ -14,6 +14,7 @@ TEXT e820(SB), $0
 	CMPB CL, $24
 	JZ _ret
 	MOVL $1, AX
+	MOVL p+8(SP), DI
 	MOVL AX, 20(DI)
 _ret:
 	MOVL BX, AX
@@ -21,6 +22,7 @@ _ret:
 _bad:
 	CALL16(pmode32(SB))
 	XORL AX, AX
+	MOVL p+8(SP), DI
 	MOVL AX, 0(DI)
 	MOVL AX, 4(DI)
 	MOVL AX, 8(DI)
diff --git a/sys/src/boot/pc/sub.c b/sys/src/boot/pc/sub.c
index fafe69ac0..69027bf2d 100644
--- a/sys/src/boot/pc/sub.c
+++ b/sys/src/boot/pc/sub.c
@@ -344,10 +344,6 @@ e820conf(void)
 	s = confend;
 
 	do{
-		e.base = 0;
-		e.len = 0;
-		e.typ = 0;
-		e.ext = 1;
 		bx = e820(bx, &e);
 		if(e.typ == 1 && e.len != 0 && (e.ext & 3) == 1){
 			if(confend == s){
-- 
cgit v1.2.3