summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2015-10-22 21:28:20 +0000
committerjhb <jhb@FreeBSD.org>2015-10-22 21:28:20 +0000
commit9740ac3060b33574f581db8a7ee96240749c81ed (patch)
tree24a943ba920de041a337bc369f1a55629ba2a11d /sys/kern
parent2705fe5cc132ba44ee6bdb210ae3bff5be670722 (diff)
downloadFreeBSD-src-9740ac3060b33574f581db8a7ee96240749c81ed.zip
FreeBSD-src-9740ac3060b33574f581db8a7ee96240749c81ed.tar.gz
Rename remaining linux32 symbols such as linux_sysent[] and
linux_syscallnames[] from linux_* to linux32_* to avoid conflicts with linux64.ko. While here, add support for linux64 binaries to systrace. - Update NOPROTO entries in amd64/linux/syscalls.master to match the main table to fix systrace build. - Add a special case for union l_semun arguments to the systrace generation. - The systrace_linux32 module now only builds the systrace_linux32.ko. module on amd64. - Add a new systrace_linux module that builds on both i386 and amd64. For i386 it builds the existing systrace_linux.ko. For amd64 it builds a systrace_linux.ko for 64-bit binaries. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D3954
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/makesyscalls.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index ef15174..75289e5 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -411,6 +411,10 @@ s/\$//g
printf("\t\tuarg[%d] = (intptr_t) p->%s; /* %s */\n", \
i - 1, \
argname[i], arg) > systrace
+ else if (arg == "union l_semun")
+ printf("\t\tuarg[%d] = p->%s.buf; /* %s */\n", \
+ i - 1, \
+ argname[i], arg) > systrace
else if (substr(arg, 1, 1) == "u" || arg == "size_t")
printf("\t\tuarg[%d] = p->%s; /* %s */\n", \
i - 1, \
OpenPOWER on IntegriCloud