Attachment 99182 Details for Bug 138220 – smap.pat

smap.pat

smap.pat (text/plain), 1.09 KB, created by James R. Van Artsdalen on 2009-08-27 00:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James R. Van Artsdalen

Created: 2009-08-27 00:00:08 UTC

Size: 1.09 KB

patch

obsolete

>Index: sys/amd64/amd64/machdep.c
>===================================================================
>--- sys/amd64/amd64/machdep.c	(revision 196500)
>+++ sys/amd64/amd64/machdep.c	(working copy)
>@@ -1236,6 +1236,19 @@
> 	smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize);
> 
> 	for (smap = smapbase; smap < smapend; smap++) {
>+		struct bios_smap *sp, *low = smap;
>+
>+		for (sp = smap + 1; sp < smapend; sp++)
>+			if (low->base > sp->base)
>+				low = sp;
>+		if (low != smap) {
>+			struct bios_smap ts;
>+
>+			ts = *smap;
>+			*smap = *low;
>+			*low = ts;
>+		}
>+
> 		if (boothowto & RB_VERBOSE)
> 			printf("SMAP type=%02x base=%016lx len=%016lx\n",
> 			    smap->type, smap->base, smap->length);
>@@ -1250,10 +1263,12 @@
> 			if (smap->base < physmap[i + 1]) {
> 				if (boothowto & RB_VERBOSE)
> 					printf(
>-	"Overlapping or non-monotonic memory region, ignoring second region\n");
>-				continue;
>+	"Overlapping memory region, ignoring second region\n");
>+				break;
> 			}
> 		}
>+		if (i <= physmap_idx)
>+		  continue;
> 
> 		if (smap->base == physmap[physmap_idx + 1]) {
> 			physmap[physmap_idx + 1] += smap->length;

Actions: View

Attachments on bug 138220: 99182