diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-09 04:42:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-09 04:42:21 -0500 |
| commit | 4385428a477559b26736cc3c80d8b68f31126c71 (patch) | |
| tree | 8eb0cbc78e79c368687fa13a1e0674ae537f830f /lib/dynamic_debug.c | |
| parent | 047a3772feaae8e43d81d790f3d3f80dae8ae676 (diff) | |
| parent | 2d75af2f2a7a6103a6d539a492fe81deacabde44 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'lib/dynamic_debug.c')
| -rw-r--r-- | lib/dynamic_debug.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 3094318bfea7..b335acb43be2 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c | |||
| @@ -141,11 +141,10 @@ static void ddebug_change(const struct ddebug_query *query, | |||
| 141 | else if (!dp->flags) | 141 | else if (!dp->flags) |
| 142 | dt->num_enabled++; | 142 | dt->num_enabled++; |
| 143 | dp->flags = newflags; | 143 | dp->flags = newflags; |
| 144 | if (newflags) { | 144 | if (newflags) |
| 145 | jump_label_enable(&dp->enabled); | 145 | dp->enabled = 1; |
| 146 | } else { | 146 | else |
| 147 | jump_label_disable(&dp->enabled); | 147 | dp->enabled = 0; |
| 148 | } | ||
| 149 | if (verbose) | 148 | if (verbose) |
| 150 | printk(KERN_INFO | 149 | printk(KERN_INFO |
| 151 | "ddebug: changed %s:%d [%s]%s %s\n", | 150 | "ddebug: changed %s:%d [%s]%s %s\n", |