From: Ben Gras <ben@minix3.org>
Date: Mon, 6 Mar 2006 16:46:12 +0000 (+0000)
Subject: Do alignment after 64k-dma-boundary adjustment
X-Git-Tag: v3.1.2a~300
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/index.html?a=commitdiff_plain;h=34e4c7d02cbadbd33af45b222cad390dcc65614c;p=minix.git

Do alignment after 64k-dma-boundary adjustment
---

diff --git a/boot/boot.c b/boot/boot.c
index ae2a2183b..424a94bc1 100755
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -502,7 +502,9 @@ void initialize(void)
 
 
 	/* Check if data segment crosses a 64K boundary. */
-	if (newaddr + (daddr - caddr) < dma64k) newaddr= dma64k - runsize;
+	if (newaddr + (daddr - caddr) < dma64k)  {
+		newaddr= (dma64k - runsize) & ~0x0FFFFL;
+	}
 #endif
 
 	/* Set the new caddr for relocate. */