Synchronize with sys/i386/boot/biosboot/asm.S, boot.c and boot.h

revisions 1.12, 1.69 and 1.21, respectively.

3 files changed, 4 insertions, 39 deletions

diff --git a/sys/pc98/boot/biosboot/asm.S b/sys/pc98/boot/biosboot/asm.S
index b0f66da..77a4b2f 100644
--- a/sys/pc98/boot/biosboot/asm.S
+++ b/sys/pc98/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id$
+ *	$Id: asm.S,v 1.3 1997/02/22 09:43:03 peter Exp $
  */
 
 
@@ -210,40 +210,6 @@ ourreturn:
 	jmp	ourreturn
 
 /*
- *
- * pbzero( dst, cnt)
- *	where src is a virtual address and dst is a physical address
- */
-
-ENTRY(pbzero)
-	push	%ebp
-	mov	%esp, %ebp
-	push	%es
-	push	%esi
-	push	%edi
-	push	%ecx
-
-	cld
-
-	/* set %es to point at the flat segment */
-	movw	$0x10, %ax
-	mov	%ax, %es
-
-	mov	0x8(%ebp), %edi		/* destination */
-	mov	0xc(%ebp), %ecx		/* count */
-	xorl	%eax, %eax		/* value 0 */
-
-	rep
-	stosb
-
-	pop	%ecx
-	pop	%edi
-	pop	%esi
-	pop	%es
-	pop	%ebp
-
-	ret
-/*
  * pcpy(src, dst, cnt)
  *	where src is a virtual address and dst is a physical address
  */
diff --git a/sys/pc98/boot/biosboot/boot.c b/sys/pc98/boot/biosboot/boot.c
index faaa70b..441353c 100644
--- a/sys/pc98/boot/biosboot/boot.c
+++ b/sys/pc98/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.13 1997/06/09 13:44:03 kato Exp $
+ *	$Id: boot.c,v 1.14 1997/06/15 16:33:52 kato Exp $
  */
 
 
@@ -289,7 +289,7 @@ loadprog(void)
  * nonexistent memory.  A full symbol table is unlikely to fit on 4MB
  * machines.
  */
-	pbzero((void *)addr,head.a_bss);
+	/* kzip & kernel will zero their own bss */
 	addr += head.a_bss;
 
 	/* Pad to a page boundary. */
diff --git a/sys/pc98/boot/biosboot/boot.h b/sys/pc98/boot/biosboot/boot.h
index d084861..0951c3fb 100644
--- a/sys/pc98/boot/biosboot/boot.h
+++ b/sys/pc98/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.10 1997/06/09 13:44:04 kato Exp $
+ *	$Id: boot.h,v 1.11 1997/07/13 12:13:02 kato Exp $
  */
 
 #include <sys/param.h>
@@ -54,7 +54,6 @@ void prot_to_real(void);
 #endif
 void startprog(unsigned int physaddr, int howto, int bootdev,
 	       /* XXX struct bootinfo * */ unsigned int bootinfo);
-void pbzero(void *dst, size_t count);
 void pcpy(const void *src, void *dst, size_t count);
 
 /* bios.S */