svn commit: r301460 - head/sys/dev/filemon

[Bryan Drewery]

Author: bdrewery
Date: Sun Jun  5 18:16:33 2016
New Revision: 301460
URL: https://svnweb.freebsd.org/changeset/base/301460

Log:
  Cleanup COMPAT_FREEBSD32 support.
  
  This is a NOP.
  
  The COMPAT_IA32 was renamed in r205014 to COMPAT_FREEBSD32 and
  COMPAT_ARCH32 does not seem to have existed.  Also remove some
  leftovers from the sysent rework in r301404.  Include
  freebsd32_util.h for the freebsd32_sysent prototype.
  
  X-MFC-With:	r301404
  Reported by:	kib
  MFC after:	3 days
  Sponsored by:	EMC / Isilon Storage Division

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

Modified: head/sys/dev/filemon/filemon.c
==============================================================================
--- head/sys/dev/filemon/filemon.c	Sun Jun  5 18:11:52 2016	(r301459)
+++ head/sys/dev/filemon/filemon.c	Sun Jun  5 18:16:33 2016	(r301460)
@@ -54,16 +54,12 @@ __FBSDID("$FreeBSD$");
 
 #include "filemon.h"
 
-#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32)
+#if defined(COMPAT_FREEBSD32)
 #include <compat/freebsd32/freebsd32_syscall.h>
 #include <compat/freebsd32/freebsd32_proto.h>
-
-extern struct sysentvec ia32_freebsd_sysvec;
+#include <compat/freebsd32/freebsd32_util.h>
 #endif
 
-extern struct sysentvec elf32_freebsd_sysvec;
-extern struct sysentvec elf64_freebsd_sysvec;
-
 static d_close_t	filemon_close;
 static d_ioctl_t	filemon_ioctl;
 static d_open_t		filemon_open;

Modified: head/sys/dev/filemon/filemon_wrapper.c
==============================================================================
--- head/sys/dev/filemon/filemon_wrapper.c	Sun Jun  5 18:11:52 2016	(r301459)
+++ head/sys/dev/filemon/filemon_wrapper.c	Sun Jun  5 18:16:33 2016	(r301460)
@@ -39,10 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
 
-#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32)
-extern struct sysent freebsd32_sysent[];
-#endif
-
 static eventhandler_tag filemon_exec_tag;
 static eventhandler_tag filemon_exit_tag;
 static eventhandler_tag filemon_fork_tag;
@@ -429,7 +425,7 @@ filemon_wrapper_install(void)
 	sysent[SYS_symlink].sy_call = (sy_call_t *) filemon_wrapper_symlink;
 	sysent[SYS_linkat].sy_call = (sy_call_t *) filemon_wrapper_linkat;
 
-#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32)
+#if defined(COMPAT_FREEBSD32)
 	freebsd32_sysent[FREEBSD32_SYS_chdir].sy_call = (sy_call_t *) filemon_wrapper_chdir;
 	freebsd32_sysent[FREEBSD32_SYS_open].sy_call = (sy_call_t *) filemon_wrapper_open;
 	freebsd32_sysent[FREEBSD32_SYS_openat].sy_call = (sy_call_t *) filemon_wrapper_openat;
@@ -438,7 +434,7 @@ filemon_wrapper_install(void)
 	freebsd32_sysent[FREEBSD32_SYS_link].sy_call = (sy_call_t *) filemon_wrapper_link;
 	freebsd32_sysent[FREEBSD32_SYS_symlink].sy_call = (sy_call_t *) filemon_wrapper_symlink;
 	freebsd32_sysent[FREEBSD32_SYS_linkat].sy_call = (sy_call_t *) filemon_wrapper_linkat;
-#endif	/* COMPAT_ARCH32 */
+#endif	/* COMPAT_FREEBSD32 */
 
 	filemon_exec_tag = EVENTHANDLER_REGISTER(process_exec,
 	    filemon_event_process_exec, NULL, EVENTHANDLER_PRI_LAST);
@@ -461,7 +457,7 @@ filemon_wrapper_deinstall(void)
 	sysent[SYS_symlink].sy_call = (sy_call_t *)sys_symlink;
 	sysent[SYS_linkat].sy_call = (sy_call_t *)sys_linkat;
 
-#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32)
+#if defined(COMPAT_FREEBSD32)
 	freebsd32_sysent[FREEBSD32_SYS_chdir].sy_call = (sy_call_t *)sys_chdir;
 	freebsd32_sysent[FREEBSD32_SYS_open].sy_call = (sy_call_t *)sys_open;
 	freebsd32_sysent[FREEBSD32_SYS_openat].sy_call = (sy_call_t *)sys_openat;
@@ -470,7 +466,7 @@ filemon_wrapper_deinstall(void)
 	freebsd32_sysent[FREEBSD32_SYS_link].sy_call = (sy_call_t *)sys_link;
 	freebsd32_sysent[FREEBSD32_SYS_symlink].sy_call = (sy_call_t *)sys_symlink;
 	freebsd32_sysent[FREEBSD32_SYS_linkat].sy_call = (sy_call_t *)sys_linkat;
-#endif	/* COMPAT_ARCH32 */
+#endif	/* COMPAT_FREEBSD32 */
 
 	EVENTHANDLER_DEREGISTER(process_exec, filemon_exec_tag);
 	EVENTHANDLER_DEREGISTER(process_exit, filemon_exit_tag);