From 5fc227e8f3a0c4b2b4243f0a1399424d6c66384e Mon Sep 17 00:00:00 2001
From: Ashok Raj <ashok.raj@intel.com>
Date: Thu, 19 Jan 2006 16:18:47 -0800
Subject: [PATCH] --- yaml --- r: 22391 b: refs/heads/master c:
 b88e926584bf100bc23f5e76b7b674d4257edcb0 h: refs/heads/master i:   22389:
 537bc914ed3a8e375a4f7197fae4afcd43e72ea3   22387:
 f5e692cec719b94949b1c22504a2ba09ad11513d   22383:
 34efecafb4b0e0d304001589c1494e3a5b5badcf v: v3

---
 [refs]                            | 2 +-
 trunk/arch/ia64/kernel/acpi.c     | 2 ++
 trunk/arch/ia64/kernel/iosapic.c  | 4 ++--
 trunk/arch/ia64/kernel/topology.c | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1667f8368e91..326442c0ccd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff741906ad3cf4b8ca1a958acb013a97a6381ca2
+refs/heads/master: b88e926584bf100bc23f5e76b7b674d4257edcb0
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
index fe1d90b0c6ea..8d350b33a20f 100644
--- a/trunk/arch/ia64/kernel/acpi.c
+++ b/trunk/arch/ia64/kernel/acpi.c
@@ -284,6 +284,7 @@ acpi_parse_plat_int_src(acpi_table_entry_header * header,
 	return 0;
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 unsigned int can_cpei_retarget(void)
 {
 	extern int cpe_vector;
@@ -319,6 +320,7 @@ void set_cpei_target_cpu(unsigned int cpu)
 {
 	acpi_cpei_phys_cpuid = cpu_physical_id(cpu);
 }
+#endif
 
 unsigned int get_cpei_target_cpu(void)
 {
diff --git a/trunk/arch/ia64/kernel/iosapic.c b/trunk/arch/ia64/kernel/iosapic.c
index 37ac742da8ed..8832c553230a 100644
--- a/trunk/arch/ia64/kernel/iosapic.c
+++ b/trunk/arch/ia64/kernel/iosapic.c
@@ -655,8 +655,8 @@ get_target_cpu (unsigned int gsi, int vector)
 		return cpu_physical_id(smp_processor_id());
 
 #ifdef CONFIG_ACPI
-		if (cpe_vector > 0 && vector == IA64_CPEP_VECTOR)
-			return get_cpei_target_cpu();
+	if (cpe_vector > 0 && vector == IA64_CPEP_VECTOR)
+		return get_cpei_target_cpu();
 #endif
 
 #ifdef CONFIG_NUMA
diff --git a/trunk/arch/ia64/kernel/topology.c b/trunk/arch/ia64/kernel/topology.c
index 706b7734e191..c9562d94b9c3 100644
--- a/trunk/arch/ia64/kernel/topology.c
+++ b/trunk/arch/ia64/kernel/topology.c
@@ -36,7 +36,7 @@ int arch_register_cpu(int num)
 	parent = &sysfs_nodes[cpu_to_node(num)];
 #endif /* CONFIG_NUMA */
 
-#ifdef CONFIG_ACPI
+#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
 	/*
 	 * If CPEI cannot be re-targetted, and this is
 	 * CPEI target, then dont create the control file