Deleted Added
full compact
23c23
< * $FreeBSD: stable/10/sys/cddl/dev/systrace/systrace.c 269272 2014-07-29 22:26:41Z markj $
---
> * $FreeBSD: stable/10/sys/cddl/dev/systrace/systrace.c 294368 2016-01-20 01:09:53Z jhb $
63,67c63,66
< #include <amd64/linux32/linux.h>
< #include <amd64/linux32/linux32_proto.h>
< #include <amd64/linux32/linux32_syscalls.c>
< #include <amd64/linux32/linux32_systrace_args.c>
< #define MODNAME "linux32"
---
> #include <amd64/linux/linux.h>
> #include <amd64/linux/linux_proto.h>
> #include <amd64/linux/linux_syscalls.c>
> #include <amd64/linux/linux_systrace_args.c>
73d71
< #define MODNAME "linux"
76a75
> #define MODNAME "linux"
80a80,93
> #elif defined(LINUX32_SYSTRACE)
> #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>
> #else
> #error Only amd64 is supported.
> #endif
> #define MODNAME "linux32"
> extern struct sysent linux32_sysent[];
> #define MAXSYSCALL LINUX32_SYS_MAXSYSCALL
> #define SYSCALLNAMES linux32_syscallnames
> #define SYSENT linux32_sysent
105a119
> #define NATIVE_ABI
135c149
< #ifdef LINUX_SYSTRACE
---
> #ifndef NATIVE_ABI
174c188
< #if !defined(LINUX_SYSTRACE)
---
> #ifdef NATIVE_ABI
317c331
< #if !defined(LINUX_SYSTRACE)
---
> #ifdef NATIVE_ABI
331c345
< #if !defined(LINUX_SYSTRACE)
---
> #ifdef NATIVE_ABI
372a387,396
> DEV_MODULE(systrace_linux, systrace_modevent, NULL);
> MODULE_VERSION(systrace_linux, 1);
> #ifdef __amd64__
> MODULE_DEPEND(systrace_linux, linux64, 1, 1, 1);
> #else
> MODULE_DEPEND(systrace_linux, linux, 1, 1, 1);
> #endif
> MODULE_DEPEND(systrace_linux, dtrace, 1, 1, 1);
> MODULE_DEPEND(systrace_linux, opensolaris, 1, 1, 1);
> #elif defined(LINUX32_SYSTRACE)