summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJason Baron <jbaron@redhat.com>2011-01-07 13:36:58 -0500
committerSteven Rostedt <rostedt@goodmis.org>2011-01-07 23:36:59 -0500
commit2d75af2f2a7a6103a6d539a492fe81deacabde44 (patch)
tree283f6f7acc28936e25656502e77e10909fde7d6f /lib
parent870915e047a2da695be118d32dd5a900f0c3e933 (diff)
downloadlinux-3.10-2d75af2f2a7a6103a6d539a492fe81deacabde44.tar.gz
linux-3.10-2d75af2f2a7a6103a6d539a492fe81deacabde44.tar.bz2
linux-3.10-2d75af2f2a7a6103a6d539a492fe81deacabde44.zip
dynamic debug: Fix build issue with older gcc
On older gcc (3.3) dynamic debug fails to compile: include/net/inet_connection_sock.h: In function `inet_csk_reset_xmit_timer': include/net/inet_connection_sock.h:236: error: duplicate label declaration `do_printk' include/net/inet_connection_sock.h:219: error: this is a previous declaration include/net/inet_connection_sock.h:236: error: duplicate label declaration `out' include/net/inet_connection_sock.h:219: error: this is a previous declaration include/net/inet_connection_sock.h:236: error: duplicate label `do_printk' include/net/inet_connection_sock.h:236: error: duplicate label `out' Fix, by reverting the usage of JUMP_LABEL() in dynamic debug for now. Cc: <stable@kernel.org> Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/dynamic_debug.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 3094318bfea..b335acb43be 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -141,11 +141,10 @@ static void ddebug_change(const struct ddebug_query *query,
else if (!dp->flags)
dt->num_enabled++;
dp->flags = newflags;
- if (newflags) {
- jump_label_enable(&dp->enabled);
- } else {
- jump_label_disable(&dp->enabled);
- }
+ if (newflags)
+ dp->enabled = 1;
+ else
+ dp->enabled = 0;
if (verbose)
printk(KERN_INFO
"ddebug: changed %s:%d [%s]%s %s\n",