svn commit: r206346 - in stable/8/sys: compat/freebsd32 sys

[Konstantin Belousov]

Author: kib
Date: Wed Apr  7 14:22:38 2010
New Revision: 206346
URL: http://svn.freebsd.org/changeset/base/206346

Log:
  MFC r205320:
  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.

Modified:
  stable/8/sys/compat/freebsd32/freebsd32_util.h
  stable/8/sys/sys/sysent.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/compat/freebsd32/freebsd32_util.h
==============================================================================
--- stable/8/sys/compat/freebsd32/freebsd32_util.h	Wed Apr  7 14:16:14 2010	(r206345)
+++ stable/8/sys/compat/freebsd32/freebsd32_util.h	Wed Apr  7 14:22:38 2010	(r206346)
@@ -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: stable/8/sys/sys/sysent.h
==============================================================================
--- stable/8/sys/sys/sysent.h	Wed Apr  7 14:16:14 2010	(r206345)
+++ stable/8/sys/sys/sysent.h	Wed Apr  7 14:22:38 2010	(r206346)
@@ -149,7 +149,7 @@ static struct syscall_module_data name##
 };								\
 								\
 static moduledata_t name##_mod = {				\
-	#name,							\
+	"sys/" #name,						\
 	syscall_module_handler,					\
 	&name##_syscall_mod					\
 };								\