summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Cromie <jim.cromie@gmail.com>2012-05-01 05:23:12 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 08:58:06 -0400
commit516cf1be07cf3ab52e6d2f64da33b0fa5d9e0042 (patch)
tree4de9f57190026d8a6b3704f0e01911222ab8da6e
parent3ec5652ab70f6e9a888d9e5f67c858af354323b3 (diff)
dynamic_debug: use printk(KERN_WARNING..) in stub function
drivers/infiniband/ulp/srp/ib_srp.c #defines pr_fmt() PFX fmt, but PFX is not #defined until after <linux/*> headers are included. This results in a bad expansion of the pr_warn() in the stub function. 2084c2084 < printk("<4>" PFX "dyndbg supported only in " "CONFIG_DYNAMIC_DEBUG builds\n") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/linux/dynamic_debug.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 4697e4b59d6f..c18257b0fa72 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -109,7 +109,8 @@ static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
const char *modname)
{
if (strstr(param, "dyndbg")) {
- pr_warn("dyndbg supported only in "
+ /* avoid pr_warn(), which wants pr_fmt() fully defined */
+ printk(KERN_WARNING "dyndbg param is supported only in "
"CONFIG_DYNAMIC_DEBUG builds\n");
return 0; /* allow and ignore */
}