From 2a9ef007a3271ef2e49af13093d4e30c147c0b31 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 21 Aug 2007 22:27:02 +0000 Subject: [PATCH] linux-modparam-269-updates-20070821 be consistent on 2.6.9 about which MODULE parm family used --- src/afs/LINUX/osi_nfssrv.c | 2 +- src/afs/LINUX/osi_pag_module.c | 2 +- src/afs/LINUX/osi_probe.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/afs/LINUX/osi_nfssrv.c b/src/afs/LINUX/osi_nfssrv.c index 429d4d9..1ae6c9c 100644 --- a/src/afs/LINUX/osi_nfssrv.c +++ b/src/afs/LINUX/osi_nfssrv.c @@ -27,7 +27,7 @@ RCSID #include static unsigned long authtab_addr = 0; -#if defined(module_param) +#if defined(module_param) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) module_param(authtab_addr, long, 0); #else MODULE_PARM(authtab_addr, "l"); diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c index f98c661..8bea5d1 100644 --- a/src/afs/LINUX/osi_pag_module.c +++ b/src/afs/LINUX/osi_pag_module.c @@ -40,7 +40,7 @@ RCSID #endif static unsigned long nfs_server_addr = 0; -#if defined(module_param) +#if defined(module_param) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) module_param(nfs_server_addr, long, 0); #else MODULE_PARM(nfs_server_addr, "l"); diff --git a/src/afs/LINUX/osi_probe.c b/src/afs/LINUX/osi_probe.c index 7f10348..7c5400e 100644 --- a/src/afs/LINUX/osi_probe.c +++ b/src/afs/LINUX/osi_probe.c @@ -129,7 +129,7 @@ MODULE_PARM_DESC(sys_call_table_addr, "Location of system call tables"); /* If this is set, we are more careful about avoiding duplicate matches */ static int probe_carefully = 1; -#ifdef module_param +#if defined(module_param) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) module_param(probe_carefully, int, 0); #else MODULE_PARM(probe_carefully, "i"); @@ -157,7 +157,7 @@ MODULE_PARM_DESC(probe_ignore_syscalls, "Syscalls to ignore in table checks"); * 0x0080 - detail - check_table_readable */ static int probe_debug = 0x41; -#ifdef module_param +#if defined(module_param) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) module_param(probe_debug, int, 0); #else MODULE_PARM(probe_debug, "i"); @@ -173,7 +173,7 @@ MODULE_PARM(probe_debug_addr, "1-4l"); MODULE_PARM_DESC(probe_debug_addr, "Debug range starting locations"); static unsigned long probe_debug_range = 0; -#ifdef module_param +#if defined(module_param) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) module_param(probe_debug_range, long, 0); #else MODULE_PARM(probe_debug_range, "l"); @@ -181,7 +181,7 @@ MODULE_PARM(probe_debug_range, "l"); MODULE_PARM_DESC(probe_debug_range, "Debug range length"); static unsigned long probe_debug_tag = 0; -#ifdef module_param +#if defined(module_param) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) module_param(probe_debug_tag, long, 0); #else MODULE_PARM(probe_debug_tag, "l"); -- 1.9.4