diff options
| author | peter <peter@FreeBSD.org> | 2003-05-31 06:49:53 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-05-31 06:49:53 +0000 |
| commit | 3afe1a43773d9ca04262778528cd16224ce08f44 (patch) | |
| tree | 77c250a9fc67d0261a684381654d5cab176dbb7d /sys | |
| parent | 776ff76012e24cdf2b89b4f5104d9cf7c1b7de33 (diff) | |
| download | FreeBSD-src-3afe1a43773d9ca04262778528cd16224ce08f44.zip FreeBSD-src-3afe1a43773d9ca04262778528cd16224ce08f44.tar.gz | |
Make this compile with WITNESS enabled. It wants the syscall names.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/ia32/Makefile | 3 | ||||
| -rw-r--r-- | sys/amd64/ia32/ia32_syscall.c | 3 | ||||
| -rw-r--r-- | sys/amd64/ia32/syscalls.conf | 2 | ||||
| -rw-r--r-- | sys/compat/freebsd32/Makefile | 3 | ||||
| -rw-r--r-- | sys/compat/freebsd32/syscalls.conf | 2 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 1 |
6 files changed, 9 insertions, 5 deletions
diff --git a/sys/amd64/ia32/Makefile b/sys/amd64/ia32/Makefile index 1184ef4..22b5821 100644 --- a/sys/amd64/ia32/Makefile +++ b/sys/amd64/ia32/Makefile @@ -7,9 +7,10 @@ all: sysent: ia32_sysent.c ia32_syscall.h ia32_proto.h -ia32_sysent.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \ +ia32_sysent.c ia32_syscalls.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \ syscalls.master syscalls.conf -mv -f ia32_sysent.c ia32_sysent.c.bak + -mv -f ia32_syscalls.c ia32_syscalls.c.bak -mv -f ia32_syscall.h ia32_syscall.h.bak -mv -f ia32_proto.h ia32_proto.h.bak sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c index dee52b0..49d0961 100644 --- a/sys/amd64/ia32/ia32_syscall.c +++ b/sys/amd64/ia32/ia32_syscall.c @@ -83,6 +83,7 @@ #define IDTVEC(name) __CONCAT(X,name) extern inthand_t IDTVEC(int0x80_syscall), IDTVEC(rsvd); +extern const char *ia32_syscallnames[]; void ia32_syscall(struct trapframe frame); /* Called from asm code */ @@ -251,7 +252,7 @@ ia32_syscall(struct trapframe frame) cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + (code >= 0 && code < SYS_MAXSYSCALL) ? ia32_syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } diff --git a/sys/amd64/ia32/syscalls.conf b/sys/amd64/ia32/syscalls.conf index 16d94ea..0e1ded3 100644 --- a/sys/amd64/ia32/syscalls.conf +++ b/sys/amd64/ia32/syscalls.conf @@ -1,5 +1,5 @@ # $FreeBSD$ -sysnames="/dev/null" +sysnames="ia32_syscalls.c" sysproto="ia32_proto.h" sysproto_h=_IA32_SYSPROTO_H_ syshdr="ia32_syscall.h" diff --git a/sys/compat/freebsd32/Makefile b/sys/compat/freebsd32/Makefile index 1184ef4..22b5821 100644 --- a/sys/compat/freebsd32/Makefile +++ b/sys/compat/freebsd32/Makefile @@ -7,9 +7,10 @@ all: sysent: ia32_sysent.c ia32_syscall.h ia32_proto.h -ia32_sysent.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \ +ia32_sysent.c ia32_syscalls.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \ syscalls.master syscalls.conf -mv -f ia32_sysent.c ia32_sysent.c.bak + -mv -f ia32_syscalls.c ia32_syscalls.c.bak -mv -f ia32_syscall.h ia32_syscall.h.bak -mv -f ia32_proto.h ia32_proto.h.bak sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf index 16d94ea..0e1ded3 100644 --- a/sys/compat/freebsd32/syscalls.conf +++ b/sys/compat/freebsd32/syscalls.conf @@ -1,5 +1,5 @@ # $FreeBSD$ -sysnames="/dev/null" +sysnames="ia32_syscalls.c" sysproto="ia32_proto.h" sysproto_h=_IA32_SYSPROTO_H_ syshdr="ia32_syscall.h" diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index f80844d..ff30792 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -85,6 +85,7 @@ amd64/pci/pci_cfgreg.c optional pci amd64/pci/pci_bus.c optional pci amd64/ia32/ia32_misc.c optional ia32 +amd64/ia32/ia32_syscalls.c optional ia32 amd64/ia32/ia32_sysent.c optional ia32 amd64/ia32/ia32_sysvec.c optional ia32 amd64/ia32/ia32_signal.c optional ia32 |
