From owner-svn-src-head@FreeBSD.ORG  Fri Apr  8 06:27:44 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 343CF106564A;
	Fri,  8 Apr 2011 06:27:44 +0000 (UTC) (envelope-from art@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2432B8FC0C;
	Fri,  8 Apr 2011 06:27:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p386RimL066209;
	Fri, 8 Apr 2011 06:27:44 GMT (envelope-from art@svn.freebsd.org)
Received: (from art@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p386Riwn066206;
	Fri, 8 Apr 2011 06:27:44 GMT (envelope-from art@svn.freebsd.org)
Message-Id: <201104080627.p386Riwn066206@svn.freebsd.org>
From: Artem Belevich <art@FreeBSD.org>
Date: Fri, 8 Apr 2011 06:27:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220437 - in head/sys: cddl/dev/systrace
	modules/dtrace/systrace_linux32
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Apr 2011 06:27:44 -0000

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