diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/s390/kernel/ftrace.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/s390/kernel/ftrace.c')
| -rw-r--r-- | arch/s390/kernel/ftrace.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c index 57bdcb1e3cdf..f5fe34dd821b 100644 --- a/arch/s390/kernel/ftrace.c +++ b/arch/s390/kernel/ftrace.c | |||
| @@ -185,9 +185,6 @@ unsigned long prepare_ftrace_return(unsigned long ip, unsigned long parent) | |||
| 185 | { | 185 | { |
| 186 | struct ftrace_graph_ent trace; | 186 | struct ftrace_graph_ent trace; |
| 187 | 187 | ||
| 188 | /* Nmi's are currently unsupported. */ | ||
| 189 | if (unlikely(in_nmi())) | ||
| 190 | goto out; | ||
| 191 | if (unlikely(atomic_read(¤t->tracing_graph_pause))) | 188 | if (unlikely(atomic_read(¤t->tracing_graph_pause))) |
| 192 | goto out; | 189 | goto out; |
| 193 | if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY) | 190 | if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY) |