diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /lib/dynamic_debug.c | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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", |