diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-10-06 10:34:07 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2009-10-06 10:35:08 +0200 |
| commit | 22ceaf408f22680b7448f2699567ba22202e6281 (patch) | |
| tree | feebff9b0b9691c64648eaf7ba1cc06ce83f5765 /arch/s390 | |
| parent | 593c4f739859594dc4824b6d29f9abb1f0b3c669 (diff) | |
| download | linux-stable-22ceaf408f22680b7448f2699567ba22202e6281.tar.gz linux-stable-22ceaf408f22680b7448f2699567ba22202e6281.tar.bz2 linux-stable-22ceaf408f22680b7448f2699567ba22202e6281.zip | |
[S390] ftrace: drop nmi protection
The function graph tracer used to have a protection against NMI
while entering a function entry tracing. But this is useless now,
the tracer is reentrant and the ring buffer supports NMI tracing.
Same as 07868b086cca784f4b532fc2ab574ec3a73b468a for x86.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -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) { struct ftrace_graph_ent trace; - /* Nmi's are currently unsupported. */ - if (unlikely(in_nmi())) - goto out; if (unlikely(atomic_read(¤t->tracing_graph_pause))) goto out; if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY) |