From fb36137e752a3df857d294df1dfbded9ed0bd432 Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Fri, 20 Aug 2010 11:03:51 +0800
Subject: [PATCH] --- yaml --- r: 211698 b: refs/heads/master c:
 277b199800ac90811ac86d215063df1984f51619 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/watchdog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2075e7c9f49a..4e7161a17dc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a103b0d44e9f97dc430002cf3ac7a7defa3819f
+refs/heads/master: 277b199800ac90811ac86d215063df1984f51619
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index 613bc1f04610..b60e2a869bba 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/kernel/watchdog.c
@@ -202,7 +202,7 @@ static struct perf_event_attr wd_hw_attr = {
 };
 
 /* Callback function for perf event subsystem */
-void watchdog_overflow_callback(struct perf_event *event, int nmi,
+static void watchdog_overflow_callback(struct perf_event *event, int nmi,
 		 struct perf_sample_data *data,
 		 struct pt_regs *regs)
 {