From owner-svn-src-all@FreeBSD.ORG  Mon Jul  2 20:36:27 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id ACF7E1065670;
	Mon,  2 Jul 2012 20:36:27 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 80F488FC08;
	Mon,  2 Jul 2012 20:36:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q62KaRdX098122;
	Mon, 2 Jul 2012 20:36:27 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q62KaRa3098119;
	Mon, 2 Jul 2012 20:36:27 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201207022036.q62KaRa3098119@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 2 Jul 2012 20:36:27 +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: r238026 - in head/sys: dev/filemon modules
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: Mon, 02 Jul 2012 20:36:27 -0000

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