diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-16 15:16:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-16 15:16:37 -0400 |
| commit | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (patch) | |
| tree | 610700282791b0469bbf09921993857e0b0b51fe /kernel/trace/ftrace.c | |
| parent | 983f2163e7fdf11a15e05816de243f93f07eafca (diff) | |
| parent | b36461da2a0389149d7f88f3cbc05a30d1db9faa (diff) | |
Merge branch 'tip/tracing/core4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 8b23d5670088..f7ab7fc162cc 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -2062,9 +2062,9 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, | |||
| 2062 | int i, len = 0; | 2062 | int i, len = 0; |
| 2063 | char *search; | 2063 | char *search; |
| 2064 | 2064 | ||
| 2065 | if (glob && (strcmp(glob, "*") || !strlen(glob))) | 2065 | if (glob && (strcmp(glob, "*") == 0 || !strlen(glob))) |
| 2066 | glob = NULL; | 2066 | glob = NULL; |
| 2067 | else { | 2067 | else if (glob) { |
| 2068 | int not; | 2068 | int not; |
| 2069 | 2069 | ||
| 2070 | type = ftrace_setup_glob(glob, strlen(glob), &search, ¬); | 2070 | type = ftrace_setup_glob(glob, strlen(glob), &search, ¬); |