From a16b39a2f37569ec9ba172acf9cfa4084befd4b4 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Mon, 12 Feb 2007 00:54:43 -0800
Subject: [PATCH] --- yaml --- r: 48041 b: refs/heads/master c:
 47e627bc8c9a70392d2049e6af5bd55fae61fe53 h: refs/heads/master i:   48039:
 2097658502bff9c38dc8d6ae67a005da62299253 v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/cpu.h | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4179b962a05a..13b7676035e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e8ba6fba5050ec11bba90c8622aa2ed95ff711f
+refs/heads/master: 47e627bc8c9a70392d2049e6af5bd55fae61fe53
diff --git a/trunk/include/linux/cpu.h b/trunk/include/linux/cpu.h
index bfb520212d71..769ddc6df492 100644
--- a/trunk/include/linux/cpu.h
+++ b/trunk/include/linux/cpu.h
@@ -49,10 +49,20 @@ struct notifier_block;
 
 #ifdef CONFIG_SMP
 /* Need to know about CPUs going up/down? */
-extern int register_cpu_notifier(struct notifier_block *nb);
 #ifdef CONFIG_HOTPLUG_CPU
+extern int register_cpu_notifier(struct notifier_block *nb);
 extern void unregister_cpu_notifier(struct notifier_block *nb);
 #else
+
+#ifndef MODULE
+extern int register_cpu_notifier(struct notifier_block *nb);
+#else
+static inline int register_cpu_notifier(struct notifier_block *nb)
+{
+	return 0;
+}
+#endif
+
 static inline void unregister_cpu_notifier(struct notifier_block *nb)
 {
 }