svn commit: r238026 - in head/sys: dev/filemon modules

[Marcel Moolenaar]

Author: marcel
Date: Mon Jul  2 20:36:26 2012
New Revision: 238026
URL: http://svn.freebsd.org/changeset/base/238026

Log:
  There's no need to make filemon specific to i386 and amd64. All
  LP64 architectures define elf64_freebsd_sysvec and all ILP32
  architectures define elf32_freebsd_sysvec.

Modified:
  head/sys/dev/filemon/filemon_wrapper.c
  head/sys/modules/Makefile

Modified: head/sys/dev/filemon/filemon_wrapper.c
==============================================================================
--- head/sys/dev/filemon/filemon_wrapper.c	Mon Jul  2 20:28:12 2012	(r238025)
+++ head/sys/dev/filemon/filemon_wrapper.c	Mon Jul  2 20:36:26 2012	(r238026)
@@ -656,12 +656,10 @@ filemon_wrapper_vfork(struct thread *td,
 static void
 filemon_wrapper_install(void)
 {
-#if defined(__i386__)
-	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
-#elif defined(__amd64__)
+#if defined(__LP64__)
 	struct sysent *sv_table = elf64_freebsd_sysvec.sv_table;
 #else
-#error Machine type not supported
+	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
 #endif
 
 	sv_table[SYS_chdir].sy_call = (sy_call_t *) filemon_wrapper_chdir;
@@ -702,12 +700,10 @@ filemon_wrapper_install(void)
 static void
 filemon_wrapper_deinstall(void)
 {
-#if defined(__i386__)
-	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
-#elif defined(__amd64__)
+#if defined(__LP64__)
 	struct sysent *sv_table = elf64_freebsd_sysvec.sv_table;
 #else
-#error Machine type not supported
+	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
 #endif
 
 	sv_table[SYS_chdir].sy_call = (sy_call_t *)sys_chdir;

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Mon Jul  2 20:28:12 2012	(r238025)
+++ head/sys/modules/Makefile	Mon Jul  2 20:36:26 2012	(r238026)
@@ -106,7 +106,7 @@ SUBDIR=	\
 	fdc \
 	fdescfs \
 	${_fe} \
-	${_filemon} \
+	filemon \
 	firewire \
 	firmware \
 	${_fxp} \
@@ -360,10 +360,6 @@ SUBDIR=	\
 	${_zfs} \
 	zlib \
 
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-_filemon=	filemon
-.endif
-
 .if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_CPUARCH} != "mips"
 _syscons=	syscons