diff options
| author | marcel <marcel@FreeBSD.org> | 2012-07-02 20:36:26 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2012-07-02 20:36:26 +0000 |
| commit | 7a4836d104c6a4fb7609f7a8188a4b6494564fe6 (patch) | |
| tree | f47c15c7326be278579e46a6a1386fc8830d482b | |
| parent | 5fa1af1fc55a6ca425cafe7ba67da3a9fad646dc (diff) | |
| download | FreeBSD-src-7a4836d104c6a4fb7609f7a8188a4b6494564fe6.zip FreeBSD-src-7a4836d104c6a4fb7609f7a8188a4b6494564fe6.tar.gz | |
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.
| -rw-r--r-- | sys/dev/filemon/filemon_wrapper.c | 12 | ||||
| -rw-r--r-- | sys/modules/Makefile | 6 |
2 files changed, 5 insertions, 13 deletions
diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c index e59dca3..278faa9 100644 --- a/sys/dev/filemon/filemon_wrapper.c +++ b/sys/dev/filemon/filemon_wrapper.c @@ -656,12 +656,10 @@ filemon_wrapper_vfork(struct thread *td, struct vfork_args *uap) 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; diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 80ac632..9922d62 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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 |
