Commit b88e9265 authored by Ashok Raj's avatar Ashok Raj Committed by Tony Luck

[IA64] Fix UP build with BSP removal support.

Causes undefined force_cpei_retarget defined in arch/ia64/kernel/smpboot.c
Push the unneeded code inside #ifdef CONFIG_HOTPLUG_CPU.
Signed-off-by: default avatarAshok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent ff741906
...@@ -284,6 +284,7 @@ acpi_parse_plat_int_src(acpi_table_entry_header * header, ...@@ -284,6 +284,7 @@ acpi_parse_plat_int_src(acpi_table_entry_header * header,
return 0; return 0;
} }
#ifdef CONFIG_HOTPLUG_CPU
unsigned int can_cpei_retarget(void) unsigned int can_cpei_retarget(void)
{ {
extern int cpe_vector; extern int cpe_vector;
...@@ -319,6 +320,7 @@ void set_cpei_target_cpu(unsigned int cpu) ...@@ -319,6 +320,7 @@ void set_cpei_target_cpu(unsigned int cpu)
{ {
acpi_cpei_phys_cpuid = cpu_physical_id(cpu); acpi_cpei_phys_cpuid = cpu_physical_id(cpu);
} }
#endif
unsigned int get_cpei_target_cpu(void) unsigned int get_cpei_target_cpu(void)
{ {
......
...@@ -655,8 +655,8 @@ get_target_cpu (unsigned int gsi, int vector) ...@@ -655,8 +655,8 @@ get_target_cpu (unsigned int gsi, int vector)
return cpu_physical_id(smp_processor_id()); return cpu_physical_id(smp_processor_id());
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
if (cpe_vector > 0 && vector == IA64_CPEP_VECTOR) if (cpe_vector > 0 && vector == IA64_CPEP_VECTOR)
return get_cpei_target_cpu(); return get_cpei_target_cpu();
#endif #endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
......
...@@ -36,7 +36,7 @@ int arch_register_cpu(int num) ...@@ -36,7 +36,7 @@ int arch_register_cpu(int num)
parent = &sysfs_nodes[cpu_to_node(num)]; parent = &sysfs_nodes[cpu_to_node(num)];
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
#ifdef CONFIG_ACPI #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
/* /*
* If CPEI cannot be re-targetted, and this is * If CPEI cannot be re-targetted, and this is
* CPEI target, then dont create the control file * CPEI target, then dont create the control file
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment