summary refs log tree commit diff
path: root/arch/x86/mm/mmio-mod.c
diff options
context:
space:
mode:
authorStuart Bennett <stuart@freedesktop.org>2009-04-28 20:17:51 +0100
committerIngo Molnar <mingo@elte.hu>2009-04-29 11:33:34 +0200
commit0f9a623dd6c9b5b4dd00c232f29525bfc7a8ecf2 (patch)
treed442cd6e03cb458b231374697ed7bb04caafabc2 /arch/x86/mm/mmio-mod.c
parent46e91d00b1165b14b484aa33800e1bba0794ae1a (diff)
downloadlinux-0f9a623dd6c9b5b4dd00c232f29525bfc7a8ecf2.tar.gz
tracing: x86, mmiotrace: only register for die notifier when tracer active
Follow up to afcfe024aebd74b0984a41af9a34e009cf5badaf in Linus' tree
("x86: mmiotrace: quieten spurious warning message")

Signed-off-by: Stuart Bennett <stuart@freedesktop.org>
Acked-by: Pekka Paalanen <pq@iki.fi>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1240946271-7083-5-git-send-email-stuart@freedesktop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/mmio-mod.c')
-rw-r--r--arch/x86/mm/mmio-mod.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index c9342ed8b402..132772a8ec57 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -451,6 +451,7 @@ void enable_mmiotrace(void)
 
 	if (nommiotrace)
 		pr_info(NAME "MMIO tracing disabled.\n");
+	kmmio_init();
 	enter_uniprocessor();
 	spin_lock_irq(&trace_lock);
 	atomic_inc(&mmiotrace_enabled);
@@ -473,6 +474,7 @@ void disable_mmiotrace(void)
 
 	clear_trace_list(); /* guarantees: no more kmmio callbacks */
 	leave_uniprocessor();
+	kmmio_cleanup();
 	pr_info(NAME "disabled.\n");
 out:
 	mutex_unlock(&mmiotrace_mutex);