mtd/docboot doc_bootstub.S,1.7,1.8

dbrown at infradead.org dbrown at infradead.org
Wed Jun 29 16:09:49 EDT 2005


Update of /home/cvs/mtd/docboot
In directory phoenix.infradead.org:/tmp/cvs-serv13219

Modified Files:
	doc_bootstub.S 
Log Message:
We shouldn't clobber %bp.  Oops!


Index: doc_bootstub.S
===================================================================
RCS file: /home/cvs/mtd/docboot/doc_bootstub.S,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- doc_bootstub.S	21 Apr 2005 15:25:03 -0000	1.7
+++ doc_bootstub.S	29 Jun 2005 20:09:46 -0000	1.8
@@ -545,7 +545,7 @@
 	addw	%ax, gdt_src_mid
 
 		/* Memory-size code below adapted from Syslinux */
-	movw	$(0x4000-0x400), %bp	/* 15M in 1k chunks */
+	movw	$(0x4000-0x400), %di	/* 15M in 1k chunks */
 #ifdef DEBUG_BUILD
 	MSG(int15e801_string)
 #endif
@@ -553,7 +553,7 @@
 	movw	$0xe801, %ax
 	int	$0x15
 	jc	e801_fail
-	cmpw	%bp, %ax
+	cmpw	%di, %ax
 	jne	e801_fail
 	movw	%bx, %ax	/* now ax = amount of mem -16M, in 64k blocks */
 #ifdef DEBUG_BUILD
@@ -570,9 +570,9 @@
 #ifdef DEBUG_BUILD
 	call	phword
 #endif
-	cmpw	%bp, %ax	/* safety check: if it's above 15M ... */
+	cmpw	%di, %ax	/* safety check: if it's above 15M ... */
 	jbe	mem_le16meg
-	movw	%bp, %ax	/* ... replace with 15M. */
+	movw	%di, %ax	/* ... replace with 15M. */
 mem_le16meg:
 	addw	$0x400, %ax	/* Add 1M (in 1k blocks) back in. */
 	shrw	$6, %ax		/* Convert to 64k blocks (round down) */





More information about the linux-mtd-cvs mailing list