diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2009-05-26 13:37:05 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2009-05-26 13:37:05 +0000 |
| commit | 3252c37a8145c267bb3bc1ccdb1e1907debb8086 (patch) | |
| tree | ccdcb3d84c81e94af004df502ea1be1a4a57b990 /sys | |
| parent | 76ff5e9f8fa97b8d0b2ef84213caa1d1d32e5928 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/compat/linux/linux_mib.c | 4 | ||||
| -rw-r--r-- | sys/compat/linux/linux_util.h | 29 | ||||
| -rw-r--r-- | sys/modules/linux/Makefile | 3 |
3 files changed, 34 insertions, 2 deletions
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index 095b5ee67118..634d51db2077 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -318,7 +318,7 @@ linux_set_oss_version(struct thread *td, int oss_version) return (0); } -#ifdef DEBUG +#if defined(DEBUG) || defined(KTR) u_char linux_debug_map[howmany(LINUX_SYS_MAXSYSCALL, sizeof(u_char))]; @@ -377,4 +377,4 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, debug, 0, 0, linux_sysctl_debug, "A", "Linux debugging control"); -#endif /* DEBUG */ +#endif /* DEBUG || KTR */ diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 52647666898b..02280920e88e 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -104,4 +104,33 @@ int linux_driver_get_major_minor(char *node, int *major, int *minor); char *linux_get_char_devices(void); void linux_free_get_char_devices(char *string); +#if defined(KTR) + +#define KTR_LINUX KTR_SUBSYS +#define LINUX_CTRFMT(nm, fmt) #nm"("fmt")" + +#define LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6) do { \ + if (ldebug(f)) \ + CTR6(KTR_LINUX, LINUX_CTRFMT(f, m), \ + p1, p2, p3, p4, p5, p6); \ +} while (0) + +#define LINUX_CTR(f) LINUX_CTR6(f, "", 0, 0, 0, 0, 0, 0) +#define LINUX_CTR0(f, m) LINUX_CTR6(f, m, 0, 0, 0, 0, 0, 0) +#define LINUX_CTR1(f, m, p1) LINUX_CTR6(f, m, p1, 0, 0, 0, 0, 0) +#define LINUX_CTR2(f, m, p1, p2) LINUX_CTR6(f, m, p1, p2, 0, 0, 0, 0) +#define LINUX_CTR3(f, m, p1, p2, p3) LINUX_CTR6(f, m, p1, p2, p3, 0, 0, 0) +#define LINUX_CTR4(f, m, p1, p2, p3, p4) LINUX_CTR6(f, m, p1, p2, p3, p4, 0, 0) +#define LINUX_CTR5(f, m, p1, p2, p3, p4, p5) LINUX_CTR6(f, m, p1, p2, p3, p4, p5, 0) +#else +#define LINUX_CTR(f) +#define LINUX_CTR0(f, m) +#define LINUX_CTR1(f, m, p1) +#define LINUX_CTR2(f, m, p1, p2) +#define LINUX_CTR3(f, m, p1, p2, p3) +#define LINUX_CTR4(f, m, p1, p2, p3, p4) +#define LINUX_CTR5(f, m, p1, p2, p3, p4, p5) +#define LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6) +#endif + #endif /* !_LINUX_UTIL_H_ */ diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 58d5b11c555c..a598252ea44b 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -55,6 +55,9 @@ linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine .if !defined(KERNBUILDDIR) opt_inet6.h: echo "#define INET6 1" > opt_inet6.h +.if defined(KTR) +CFLAGS+= -DKTR +.endif .endif .include <bsd.kmod.mk> |