diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-05-18 11:06:31 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-05-18 11:06:49 -0400 |
| commit | 6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a (patch) | |
| tree | f2f77cc31b4548745778fca6a51b09e1d8a49804 /kernel/trace/trace_functions_graph.c | |
| parent | b50f315cbb865079a16a12fd9ae6083f98fd592c (diff) | |
| parent | c1d10d18c542278b7fbc413c289d3cb6219da6b3 (diff) | |
Merge branch 'master' into upstream.
This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 76b05980225c..962cdb24ed81 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c | |||
| @@ -905,7 +905,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s, | |||
| 905 | * | 905 | * |
| 906 | * returns 1 if | 906 | * returns 1 if |
| 907 | * - we are inside irq code | 907 | * - we are inside irq code |
| 908 | * - we just extered irq code | 908 | * - we just entered irq code |
| 909 | * | 909 | * |
| 910 | * retunns 0 if | 910 | * retunns 0 if |
| 911 | * - funcgraph-interrupts option is set | 911 | * - funcgraph-interrupts option is set |