From bad13e78cbd3b5e31ffd96b5a0d8ba0a75bdaf5c Mon Sep 17 00:00:00 2001
From: "Richard A. Holden III" <aciddeath@gmail.com>
Date: Wed, 19 Nov 2008 16:05:14 -0700
Subject: [PATCH] --- yaml --- r: 120979 b: refs/heads/master c:
 77be80e437fec44f8b7a620314b7d7b605b8d93b h: refs/heads/master i:   120977:
 08523a249bf0056511db94703fe6b276ffae29c2   120975:
 486e08a91474358e9056d547d90123447124a499 v: v3

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

diff --git a/[refs] b/[refs]
index 6b85afde559a..884a3be0cd04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c
+refs/heads/master: 77be80e437fec44f8b7a620314b7d7b605b8d93b
diff --git a/trunk/arch/x86/kernel/genx2apic_uv_x.c b/trunk/arch/x86/kernel/genx2apic_uv_x.c
index f02bbe5d0178..221299f4509f 100644
--- a/trunk/arch/x86/kernel/genx2apic_uv_x.c
+++ b/trunk/arch/x86/kernel/genx2apic_uv_x.c
@@ -400,6 +400,7 @@ static void __cpuinit uv_heartbeat_enable(int cpu)
 		uv_heartbeat_enable(0);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void __cpuinit uv_heartbeat_disable(int cpu)
 {
 	if (uv_cpu_hub_info(cpu)->scir.enabled) {
@@ -409,7 +410,6 @@ static void __cpuinit uv_heartbeat_disable(int cpu)
 	uv_set_cpu_scir_bits(cpu, 0xff);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 /*
  * cpu hotplug notifier
  */