From owner-svn-src-all@FreeBSD.ORG  Fri Mar 19 10:52:55 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 714A51065678;
	Fri, 19 Mar 2010 10:52:55 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6067F8FC1E;
	Fri, 19 Mar 2010 10:52:55 +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 o2JAqtqQ025664;
	Fri, 19 Mar 2010 10:52:55 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2JAqtIZ025661;
	Fri, 19 Mar 2010 10:52:55 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201003191052.o2JAqtIZ025661@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 19 Mar 2010 10:52:55 +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: r205320 - in head/sys: compat/freebsd32 sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Mar 2010 10:52:55 -0000

Author: kib
Date: Fri Mar 19 10:52:54 2010
New Revision: 205320
URL: http://svn.freebsd.org/changeset/base/205320

Log:
  FOr SYSCALL_MODULE_HELPER, use "sys/<syscallname>" module name.
  FOr SYSCALL32_MODULE_HELPER, use "sys32/<syscallname>" module name.
  This avoids modules name conflict when compat32 syscall does not
  need shims.
  
  Note that SYSCALL_MODULE_HELPER is going to be unused in the tree by
  several next commits.
  
  Suggested by:	jhb
  MFC after:	2 weeks

Modified:
  head/sys/compat/freebsd32/freebsd32_util.h
  head/sys/sys/sysent.h

Modified: head/sys/compat/freebsd32/freebsd32_util.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_util.h	Fri Mar 19 10:49:03 2010	(r205319)
+++ head/sys/compat/freebsd32/freebsd32_util.h	Fri Mar 19 10:52:54 2010	(r205320)
@@ -61,7 +61,7 @@ static struct syscall_module_data name##
 };                                                             \
                                                                \
 static moduledata_t name##32_mod = {                           \
-       #name,                                                  \
+       "sys32/" #name,                                         \
        syscall32_module_handler,                               \
        &name##_syscall32_mod                                   \
 };                                                             \

Modified: head/sys/sys/sysent.h
==============================================================================
--- head/sys/sys/sysent.h	Fri Mar 19 10:49:03 2010	(r205319)
+++ head/sys/sys/sysent.h	Fri Mar 19 10:52:54 2010	(r205320)
@@ -149,7 +149,7 @@ static struct syscall_module_data name##
 };								\
 								\
 static moduledata_t name##_mod = {				\
-	#name,							\
+	"sys/" #name,						\
 	syscall_module_handler,					\
 	&name##_syscall_mod					\
 };								\