svn commit: r205320 - in head/sys: compat/freebsd32 sys

[Konstantin Belousov]

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					\
 };								\