diff options
| author | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:08 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:54 -0500 |
| commit | fc582aef7dcc27a7120cf232c1e76c569c7b6eab (patch) | |
| tree | 7d275dd4ceab6067b91e9a25a5f6338b425fbccd /lib/dynamic_debug.c | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
Diffstat (limited to 'lib/dynamic_debug.c')
| -rw-r--r-- | lib/dynamic_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 99fec3ae405a..c37aeacd7651 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c | |||
| @@ -309,7 +309,7 @@ static int ddebug_parse_query(char *words[], int nwords, | |||
| 309 | struct ddebug_query *query, const char *modname) | 309 | struct ddebug_query *query, const char *modname) |
| 310 | { | 310 | { |
| 311 | unsigned int i; | 311 | unsigned int i; |
| 312 | int rc; | 312 | int rc = 0; |
| 313 | 313 | ||
| 314 | /* check we have an even number of words */ | 314 | /* check we have an even number of words */ |
| 315 | if (nwords % 2 != 0) { | 315 | if (nwords % 2 != 0) { |