From e01e998d17f5ce59528429d44b50119f99e03288 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 21 Nov 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-11-21

---
 pc/devvga.c | 10 ++++++----
 pc/l.s      |  4 +---
 pc/main.c   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pc/devvga.c b/pc/devvga.c
index 1f665c4623a12b30f8c5abcf1027eb14f6c306d5..58ba216557d9ba0625214300781b0c1c223e0b69 100644
--- a/pc/devvga.c
+++ b/pc/devvga.c
@@ -647,20 +647,21 @@ vgaupdate(void)
 
 	switch(gscreen.ldepth){
 	case 0:
-		r.min.x &= ~15;		/* 16 bit allignment for l0update() */
+		r.min.x &= ~15;		/* 16 pixel allignment for l0update() */
 		f = l0update;
 		len = (r.max.x + 7)/8 - r.min.x/8;
 		if(len & 1)
 			len++;		/* 16 bit allignment for l0update() */
 		break;
 	case 1:
-		r.min.x &= ~15;		/* 16 bit allignment for l1update() */
+		r.min.x &= ~15;		/* 8 pixel allignment for l1update() */
 		f = l1update;
 		len = (r.max.x + 7)/8 - r.min.x/8;
 		if(len & 1)
-			len++;		/* 16 bit allignment for l1update() */
+			len++;		/* 8 pixel allignment for l1update() */
 		break;
 	case 2:
+		r.min.x &= ~7;		/* 8 pixel allignment for l2update() */
 		f = l2update;
 		len = (r.max.x + 7)/8 - r.min.x/8;
 		break;
@@ -678,7 +679,8 @@ vgaupdate(void)
 	page = off>>16;
 	off &= (1<<16)-1;
 	hp = ((uchar*)vgascreen.base) + off;
-	off = r.min.y * gscreen.width * BY2WD + (r.min.x>>(3 - gscreen.ldepth));
+	off = r.min.y * gscreen.width * BY2WD
+		+ (r.min.x>>(3 - gscreen.ldepth));
 	sp = ((uchar*)gscreen.base) + off;
 
 	edisp = ((uchar*)vgascreen.base) + 64*1024;
diff --git a/pc/l.s b/pc/l.s
index d335fd5d0a3fabe1e69adeefd4a3787a4b907ea2..6f5e79be8911b0a22c4016e013ea3497ad2d2ddb 100644
--- a/pc/l.s
+++ b/pc/l.s
@@ -696,9 +696,7 @@ l10:
 	MOVB	$0xA,AL
 	OUTB
 	MOVW	BX,-2(DI)(CX*1)
-	LOOP	l11
-	RET
-l11:	LOOP	l10
+	LOOP	l10
 	RET
 
 /*
diff --git a/pc/main.c b/pc/main.c
index f95d053b4a771a13fad14acad4be501f4e13090c..9ae53c199b0c62e696096f07e416c17f52a25949 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -275,8 +275,8 @@ confinit(void)
 	pcnt = (1<<conf.ldepth)-1;		/* Calculate % of memory for page pool */
 	pcnt = 70 - (pcnt*10);
 	conf.upages = (conf.npage*pcnt)/100;
-	if(conf.npage - conf.upages < 1572864/BY2PG)
-		conf.upages = conf.npage - 1572864/BY2PG;
+	if(conf.npage - conf.upages < (2*MB)/BY2PG)
+		conf.upages = conf.npage - (2*MB)/BY2PG;
 
 	ktop = PGROUND((ulong)end);
 	ktop = PADDR(ktop);