From: John Tsiombikas <nuclear@member.fsf.org>
Date: Mon, 30 Apr 2018 23:11:34 +0000 (+0300)
Subject: Merge pull request #1 from cherouvim/patch-1
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=commitdiff_plain;h=7e6429a03f2a18ec587ebddfd5cb823ddc1361a3;hp=f8a1d5e7149556e8afd49612e80c78330a985434

Merge pull request #1 from cherouvim/patch-1

typo in the README file
---

diff --git a/src/boot/boot2.s b/src/boot/boot2.s
index 2a163e1..719f37e 100644
--- a/src/boot/boot2.s
+++ b/src/boot/boot2.s
@@ -615,16 +615,20 @@ e820_looptop:
 	cmp $0x534d4150, %eax
 	jnz e820_fail
 
+	# skip areas starting above 4GB as we won't be able to use them
+	cmpl $0, 4(%edi)
+	jnz e820_skip
+
+	# only care for type 1 (usable ram), otherwise ignore
+	cmpl $1, 16(%edi)
+	jnz e820_skip
+
 	mov buffer, %eax
 	mov $boot_mem_map, %esi
 	mov boot_mem_map_size, %ebp
 	# again, that's [ebp * 8 + esi]
 	mov %eax, (%esi,%ebp,8)
 
-	# only care for type 1 (usable ram), otherwise ignore
-	cmpl $1, 16(%edi)
-	jnz e820_skip
-
 	# skip areas with 0 size (also clamp size to 4gb)
 	# test high 32bits
 	cmpl $0, 12(%edi)