From 91933a41184cd816cb8ce4d96cf8764ebd7dde8c Mon Sep 17 00:00:00 2001
From: Marcus Brinkmann <marcus@gnu.org>
Date: Sun, 23 Jul 2000 00:34:12 +0000
Subject: 2000-07-04  Marcus Brinkmann <marcus@gnu.org>

	* debian/changelog: Add entry for new Debian upload.
        * linux/dev/drivers/scsi/seagate.c (WRITE_CONTROL, WRITE_DATA):
        Added from linux 2.2.15.
        (__asm__ constructs): Replace with equivalent C code from linux 2.2.15
        to support gcc-2.95.
        * linux/src/drivers/scsi/in2000.h: Update asm code to linux 2.2.15.
	* linux/src/drivers/scsi/ppa.c: Replace asm code with equivalent
	C code from linux 2.2.15.

2000-02-06  Stefan Weil <stefan.weil@de.heidelberg.com>

	* device/subrs.c: Fixed compiler warning.
	* ddb/db_output.c, kern/bootstrap.c, kern/debug.c, kern/printf.c:
	Replaced varargs.h by stdarg.h. Fixed prototypes (const char *fmt).
	* ddb/db_output.h: Use prototype for db_printf.
	* i386/Files: removed varargs.h.
	* i386/i386/pit.h: Fixed compiler warning.
	* i386/i386at/model_dep.c: Tried to fix compiler warning.
	* i386/include/mach/sa/sys/varargs.h: Removed.
	* i386/linux/Makefile.in: Removed delay.S, added delay.c.
	* linux/dev/include/asm-i386/segment.h: Support gcc-2.95.
	* linux/dev/include/asm-i386/string.h,
	linux/src/include/asm-i386/string.h: Update from linux-2.2.14.
	* linux/dev/lib/vsprintf.c: Fixed compiler warning.
	* linux/src/include/asm-i386/delay.h: Update from linux-2.2.14.
	* linux/src/arch/i386/lib/delay.c: Copy from linux-2.2.14.
	* linux/src/include/asm-i386/string.h: Update from linux-2.2.14.
---
 kern/bootstrap.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'kern/bootstrap.c')

diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index c3c971d..d6dcad4 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -43,7 +43,7 @@
 #include <vm/vm_kern.h>
 #include <device/device_port.h>
 
-#include <sys/varargs.h>
+#include <stdarg.h>
 
 #include <mach/machine/multiboot.h>
 #include <mach/exec/exec.h>
@@ -335,9 +335,7 @@ extern vm_offset_t	user_stack_low();
 extern vm_offset_t	set_user_regs();
 
 void
-static build_args_and_stack(boot_exec_info, va_alist)
-	struct exec_info *boot_exec_info;
-	va_dcl
+static build_args_and_stack(struct exec_info *boot_exec_info, ...)
 {
 	vm_offset_t	stack_base;
 	vm_size_t	stack_size;
@@ -358,7 +356,7 @@ static build_args_and_stack(boot_exec_info, va_alist)
 	/*
 	 * Calculate the size of the argument list.
 	 */
-	va_start(argv_ptr);
+	va_start(argv_ptr, boot_exec_info);
 	arg_len = 0;
 	arg_count = 0;
 	for (;;) {
@@ -417,7 +415,7 @@ static build_args_and_stack(boot_exec_info, va_alist)
 	/*
 	 * Then the strings and string pointers for each argument
 	 */
-	va_start(argv_ptr);
+	va_start(argv_ptr, boot_exec_info);
 	while (--arg_count >= 0) {
 	    arg_ptr = va_arg(argv_ptr, char *);
 	    arg_item_len = strlen(arg_ptr) + 1; /* include trailing 0 */
-- 
cgit v1.2.3