From ae4f6ce0330f407d349dd04ae32d46a33cd7300d Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 2 Mar 2010 14:20:14 +0100
Subject: [PATCH] --- yaml --- r: 205386 b: refs/heads/master c:
 5671a10e2bc7f99d9157c6044faf8be2ef302361 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/nmi_watchdog.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dae8698ea964..32345a226a60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c99c30feadf664ccd8590b96259cb9f3954bd246
+refs/heads/master: 5671a10e2bc7f99d9157c6044faf8be2ef302361
diff --git a/trunk/kernel/nmi_watchdog.c b/trunk/kernel/nmi_watchdog.c
index 0a6f57f537a7..a79d211c30df 100644
--- a/trunk/kernel/nmi_watchdog.c
+++ b/trunk/kernel/nmi_watchdog.c
@@ -244,6 +244,8 @@ static int __init spawn_nmi_watchdog_task(void)
 	if (nonmi_watchdog)
 		return 0;
 
+	printk(KERN_INFO "NMI watchdog enabled, takes one hw-pmu counter.\n");
+
 	err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
 	if (err == NOTIFY_BAD) {
 		BUG();