Commit 881fca9e authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds

[PATCH] IB/ipoib: rename global symbols

Make IPoIB data_debug_level module parameter static to the single file
where it is used.  Also Rename IPoIB module parameter variable from
"debug_level" to "ipoib_debug_level".  This avoids possible name
clashes if IPoIB is built into the kernel.  We use module_param_named
so that the user-visible parameter names remain the same.
Signed-off-by: default avatarTom Duffy <tduffy@sun.com>
Signed-off-by: default avatarRoland Dreier <roland@topspin.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c33bb844
...@@ -308,11 +308,11 @@ static inline void ipoib_unregister_debugfs(void) { } ...@@ -308,11 +308,11 @@ static inline void ipoib_unregister_debugfs(void) { }
#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
extern int debug_level; extern int ipoib_debug_level;
#define ipoib_dbg(priv, format, arg...) \ #define ipoib_dbg(priv, format, arg...) \
do { \ do { \
if (debug_level > 0) \ if (ipoib_debug_level > 0) \
ipoib_printk(KERN_DEBUG, priv, format , ## arg); \ ipoib_printk(KERN_DEBUG, priv, format , ## arg); \
} while (0) } while (0)
#define ipoib_dbg_mcast(priv, format, arg...) \ #define ipoib_dbg_mcast(priv, format, arg...) \
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "ipoib.h" #include "ipoib.h"
#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
int data_debug_level; static int data_debug_level;
module_param(data_debug_level, int, 0644); module_param(data_debug_level, int, 0644);
MODULE_PARM_DESC(data_debug_level, MODULE_PARM_DESC(data_debug_level,
......
...@@ -51,9 +51,9 @@ MODULE_DESCRIPTION("IP-over-InfiniBand net driver"); ...@@ -51,9 +51,9 @@ MODULE_DESCRIPTION("IP-over-InfiniBand net driver");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
int debug_level; int ipoib_debug_level;
module_param(debug_level, int, 0644); module_param_named(debug_level, ipoib_debug_level, int, 0644);
MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0"); MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0");
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment