23c23
< * $FreeBSD: head/sys/cddl/dev/systrace/systrace.c 211608 2010-08-22 10:53:32Z rpaulo $
---
> * $FreeBSD: head/sys/cddl/dev/systrace/systrace.c 219561 2011-03-12 09:09:25Z avg $
62,66c62,74
< #include <linux.h>
< #include <linux_syscall.h>
< #include <linux_proto.h>
< #include <linux_syscallnames.c>
< #include <linux_systrace.c>
---
> #if defined(__amd64__)
> #include <amd64/linux32/linux.h>
> #include <amd64/linux32/linux32_proto.h>
> #include <amd64/linux32/linux32_syscalls.c>
> #include <amd64/linux32/linux32_systrace_args.c>
> #elif defined(__i386__)
> #include <i386/linux/linux.h>
> #include <i386/linux/linux_proto.h>
> #include <i386/linux/linux_syscalls.c>
> #include <i386/linux/linux_systrace_args.c>
> #else
> #error Only i386 and amd64 are supported.
> #endif
68,69c76
< #define DEVNAME "dtrace/linsystrace"
< #define PROVNAME "linsyscall"
---
> #define MODNAME "linux32"
72a80,93
> #elif defined(FREEBSD32_SYSTRACE)
> /*
> * The syscall arguments are processed into a DTrace argument array
> * using a generated function. See sys/kern/makesyscalls.sh.
> */
> #include <compat/freebsd32/freebsd32_proto.h>
> #include <compat/freebsd32/freebsd32_util.h>
> #include <compat/freebsd32/freebsd32_syscall.h>
> #include <compat/freebsd32/freebsd32_systrace_args.c>
> extern const char *freebsd32_syscallnames[];
> #define MODNAME "freebsd32"
> #define MAXSYSCALL FREEBSD32_SYS_MAXSYSCALL
> #define SYSCALLNAMES freebsd32_syscallnames
> #define SYSENT freebsd32_sysent
80,81c101
< #define DEVNAME "dtrace/systrace"
< #define PROVNAME "syscall"
---
> #define MODNAME "freebsd"
86a107,109
> #define PROVNAME "syscall"
> #define DEVNAME "dtrace/systrace/" MODNAME
>
217c240
< if (dtrace_probe_lookup(systrace_id, NULL,
---
> if (dtrace_probe_lookup(systrace_id, MODNAME,
221c244
< (void) dtrace_probe_create(systrace_id, NULL, uglyhack.pp_syscallnames[i],
---
> (void) dtrace_probe_create(systrace_id, MODNAME, uglyhack.pp_syscallnames[i],
224c247
< (void) dtrace_probe_create(systrace_id, NULL, uglyhack.pp_syscallnames[i],
---
> (void) dtrace_probe_create(systrace_id, MODNAME, uglyhack.pp_syscallnames[i],
338,343c361,370
< DEV_MODULE(linsystrace, systrace_modevent, NULL);
< MODULE_VERSION(linsystrace, 1);
< MODULE_DEPEND(linsystrace, linux, 1, 1, 1);
< MODULE_DEPEND(linsystrace, systrace, 1, 1, 1);
< MODULE_DEPEND(linsystrace, dtrace, 1, 1, 1);
< MODULE_DEPEND(linsystrace, opensolaris, 1, 1, 1);
---
> DEV_MODULE(systrace_linux32, systrace_modevent, NULL);
> MODULE_VERSION(systrace_linux32, 1);
> MODULE_DEPEND(systrace_linux32, linux, 1, 1, 1);
> MODULE_DEPEND(systrace_linux32, dtrace, 1, 1, 1);
> MODULE_DEPEND(systrace_linux32, opensolaris, 1, 1, 1);
> #elif defined(FREEBSD32_SYSTRACE)
> DEV_MODULE(systrace_freebsd32, systrace_modevent, NULL);
> MODULE_VERSION(systrace_freebsd32, 1);
> MODULE_DEPEND(systrace_freebsd32, dtrace, 1, 1, 1);
> MODULE_DEPEND(systrace_freebsd32, opensolaris, 1, 1, 1);