svn commit: r220437 - in head/sys: cddl/dev/systrace modules/dtrace/systrace_linux32

[Artem Belevich]

Author: art
Date: Fri Apr  8 06:27:43 2011
New Revision: 220437
URL: http://svn.freebsd.org/changeset/base/220437

Log:
  Stripped '32' suffix from linux systrace module name on i386.
  
  Approved by: avg

Modified:
  head/sys/cddl/dev/systrace/systrace.c
  head/sys/modules/dtrace/systrace_linux32/Makefile

Modified: head/sys/cddl/dev/systrace/systrace.c
==============================================================================
--- head/sys/cddl/dev/systrace/systrace.c	Fri Apr  8 06:20:43 2011	(r220436)
+++ head/sys/cddl/dev/systrace/systrace.c	Fri Apr  8 06:27:43 2011	(r220437)
@@ -64,16 +64,17 @@
 #include <amd64/linux32/linux32_proto.h>
 #include <amd64/linux32/linux32_syscalls.c>
 #include <amd64/linux32/linux32_systrace_args.c>
+#define	MODNAME		"linux32"
 #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>
+#define	MODNAME		"linux"
 #else
 #error Only i386 and amd64 are supported.
 #endif
 extern struct sysent linux_sysent[];
-#define	MODNAME		"linux32"
 #define	MAXSYSCALL	LINUX_SYS_MAXSYSCALL
 #define	SYSCALLNAMES	linux_syscallnames
 #define	SYSENT		linux_sysent
@@ -132,7 +133,7 @@ static struct cdevsw systrace_cdevsw = {
 	.d_version	= D_VERSION,
 	.d_open		= systrace_open,
 #ifdef LINUX_SYSTRACE
-	.d_name		= "linsystrace",
+	.d_name		= "systrace_" MODNAME,
 #else
 	.d_name		= "systrace",
 #endif

Modified: head/sys/modules/dtrace/systrace_linux32/Makefile
==============================================================================
--- head/sys/modules/dtrace/systrace_linux32/Makefile	Fri Apr  8 06:20:43 2011	(r220436)
+++ head/sys/modules/dtrace/systrace_linux32/Makefile	Fri Apr  8 06:27:43 2011	(r220437)
@@ -2,7 +2,12 @@
 
 .PATH: ${.CURDIR}/../../../cddl/dev/systrace
 
+.if ${MACHINE} == "amd64"
 KMOD=		systrace_linux32
+.else
+KMOD=		systrace_linux
+.endif
+
 SRCS=		systrace.c
 SRCS+=		vnode_if.h