[PATCH 01/26] noftrace

[Chris Wilson]

---
 kernel/trace/trace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7390bca22db3..4558fba74e10 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -8793,7 +8793,7 @@ static __init int tracer_init_tracefs(void)
 static int trace_panic_handler(struct notifier_block *this,
 			       unsigned long event, void *unused)
 {
-	if (ftrace_dump_on_oops)
+	if (ftrace_dump_on_oops && 0)
 		ftrace_dump(ftrace_dump_on_oops);
 	return NOTIFY_OK;
 }
@@ -8810,7 +8810,7 @@ static int trace_die_handler(struct notifier_block *self,
 {
 	switch (val) {
 	case DIE_OOPS:
-		if (ftrace_dump_on_oops)
+		if (ftrace_dump_on_oops && 0)
 			ftrace_dump(ftrace_dump_on_oops);
 		break;
 	default:
-- 
2.24.0