diff options
| author | Marcus Brinkmann <marcus@gnu.org> | 2000-07-23 00:34:12 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <marcus@gnu.org> | 2000-07-23 00:34:12 +0000 |
| commit | 91933a41184cd816cb8ce4d96cf8764ebd7dde8c (patch) | |
| tree | 18d263f9e1f1a851a1cd13851a2acba48b2e1fe6 /kern/debug.c | |
| parent | 92976e1b4ab184ff6cf70d7bd9944ae5050c4fc3 (diff) | |
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.
Diffstat (limited to 'kern/debug.c')
| -rw-r--r-- | kern/debug.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/kern/debug.c b/kern/debug.c index 26c402d..2ba15fe 100644 --- a/kern/debug.c +++ b/kern/debug.c @@ -24,15 +24,18 @@ * the rights to redistribute these changes. */ +#include <stdarg.h> + #include <mach_kdb.h> #include <norma_ipc.h> #include <cpus.h> #include "cpu_number.h" #include <kern/lock.h> -#include <sys/varargs.h> #include <kern/thread.h> +#warning missing include for panic() +void panic(const char *s, ...); extern void cnputc(); @@ -105,7 +108,7 @@ void Debugger(message) boolean_t panic_lock_initialized = FALSE; decl_simple_lock_data(, panic_lock) -char *panicstr; +const char *panicstr; int paniccpu; void @@ -120,9 +123,7 @@ panic_init() /*VARARGS1*/ void -panic(s, va_alist) - char * s; - va_dcl +panic(const char *s, ...) { va_list listp; #if NORMA_IPC @@ -152,7 +153,7 @@ panic(s, va_alist) printf("(cpu %U)", paniccpu); #endif printf(": "); - va_start(listp); + va_start(listp, s); _doprnt(s, &listp, cnputc, 0); va_end(listp); printf("\n"); @@ -176,17 +177,14 @@ panic(s, va_alist) */ /*VARARGS2*/ void -log(level, fmt, va_alist) - int level; - char * fmt; - va_dcl +log(int level, const char *fmt, ...) { va_list listp; #ifdef lint level++; #endif - va_start(listp); + va_start(listp, fmt); _doprnt(fmt, &listp, cnputc, 0); va_end(listp); } |