From 05c74cb9180ff7192776ad04a69a9b31b7dae2d8 Mon Sep 17 00:00:00 2001 From: kib Date: Fri, 23 Oct 2015 11:41:55 +0000 Subject: [PATCH] Fix build for the KTR-enabled kernels. Sponsored by: The FreeBSD Foundation --- sys/compat/linux/linux_misc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index ccb618c51ed..de918695c8e 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2356,7 +2356,13 @@ linux_ppoll(struct thread *td, struct linux_ppoll_args *args) #if defined(DEBUG) || defined(KTR) /* XXX: can be removed when every ldebug(...) and KTR stuff are removed. */ -u_char linux_debug_map[howmany(LINUX_SYS_MAXSYSCALL, sizeof(u_char))]; +#ifdef COMPAT_LINUX32 +#define L_MAXSYSCALL LINUX32_SYS_MAXSYSCALL +#else +#define L_MAXSYSCALL LINUX_SYS_MAXSYSCALL +#endif + +u_char linux_debug_map[howmany(L_MAXSYSCALL, sizeof(u_char))]; static int linux_debug(int syscall, int toggle, int global) @@ -2368,7 +2374,7 @@ linux_debug(int syscall, int toggle, int global) memset(linux_debug_map, c, sizeof(linux_debug_map)); return (0); } - if (syscall < 0 || syscall >= LINUX_SYS_MAXSYSCALL) + if (syscall < 0 || syscall >= L_MAXSYSCALL) return (EINVAL); if (toggle) clrbit(linux_debug_map, syscall); @@ -2376,6 +2382,7 @@ linux_debug(int syscall, int toggle, int global) setbit(linux_debug_map, syscall); return (0); } +#undef L_MAXSYSCALL /* * Usage: sysctl linux.debug=.<0/1> -- 2.39.5