d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There's no need to make filemon specific to i386 and amd64. All

Browse Source 
LP64 architectures define elf64_freebsd_sysvec and all ILP32
architectures define elf32_freebsd_sysvec.
This commit is contained in:
Marcel Moolenaar 2012-07-02 20:36:26 +00:00
parent dd4b2c09ac
commit 097f09bb98
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/filemon/filemon_wrapper.c
View File

@ -656,12 +656,10 @@ filemon_wrapper_vfork(struct thread *td, struct vfork_args *uap)
static void static void
filemon_wrapper_install(void) filemon_wrapper_install(void)
{ {
#if defined(__i386__) #if defined(__LP64__)
struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
#elif defined(__amd64__)
struct sysent *sv_table = elf64_freebsd_sysvec.sv_table; struct sysent *sv_table = elf64_freebsd_sysvec.sv_table;
#else #else
#error Machine type not supported struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
#endif #endif
sv_table[SYS_chdir].sy_call = (sy_call_t *) filemon_wrapper_chdir; sv_table[SYS_chdir].sy_call = (sy_call_t *) filemon_wrapper_chdir;
@ -702,12 +700,10 @@ filemon_wrapper_install(void)
static void static void
filemon_wrapper_deinstall(void) filemon_wrapper_deinstall(void)
{ {
#if defined(__i386__) #if defined(__LP64__)
struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
#elif defined(__amd64__)
struct sysent *sv_table = elf64_freebsd_sysvec.sv_table; struct sysent *sv_table = elf64_freebsd_sysvec.sv_table;
#else #else
#error Machine type not supported struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
#endif #endif
sv_table[SYS_chdir].sy_call = (sy_call_t *)sys_chdir; sv_table[SYS_chdir].sy_call = (sy_call_t *)sys_chdir;

6
sys/modules/Makefile
View File

@ -106,7 +106,7 @@ SUBDIR= \
fdc \ fdc \
fdescfs \ fdescfs \
${_fe} \ ${_fe} \
${_filemon} \ filemon \
firewire \ firewire \
firmware \ firmware \
${_fxp} \ ${_fxp} \
@ -360,10 +360,6 @@ SUBDIR= \
${_zfs} \ ${_zfs} \
zlib \ zlib \
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
_filemon= filemon
.endif
.if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \ .if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
${MACHINE_CPUARCH} != "mips" ${MACHINE_CPUARCH} != "mips"
_syscons= syscons _syscons= syscons