diff options
author | Ashok Raj <ashok.raj@intel.com> | 2006-01-19 19:18:47 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-01-19 19:18:47 -0500 |
commit | b88e926584bf100bc23f5e76b7b674d4257edcb0 (patch) | |
tree | b91879ffd7b4158f4458878c3be3e66dacb57c4c /arch/ia64/kernel | |
parent | ff741906ad3cf4b8ca1a958acb013a97a6381ca2 (diff) |
[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: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/iosapic.c | 4 | ||||
-rw-r--r-- | arch/ia64/kernel/topology.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index fe1d90b0c6ea..8d350b33a20f 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -284,6 +284,7 @@ acpi_parse_plat_int_src(acpi_table_entry_header * header, | |||
284 | return 0; | 284 | return 0; |
285 | } | 285 | } |
286 | 286 | ||
287 | #ifdef CONFIG_HOTPLUG_CPU | ||
287 | unsigned int can_cpei_retarget(void) | 288 | unsigned int can_cpei_retarget(void) |
288 | { | 289 | { |
289 | extern int cpe_vector; | 290 | extern int cpe_vector; |
@@ -319,6 +320,7 @@ void set_cpei_target_cpu(unsigned int cpu) | |||
319 | { | 320 | { |
320 | acpi_cpei_phys_cpuid = cpu_physical_id(cpu); | 321 | acpi_cpei_phys_cpuid = cpu_physical_id(cpu); |
321 | } | 322 | } |
323 | #endif | ||
322 | 324 | ||
323 | unsigned int get_cpei_target_cpu(void) | 325 | unsigned int get_cpei_target_cpu(void) |
324 | { | 326 | { |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 37ac742da8ed..8832c553230a 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -655,8 +655,8 @@ get_target_cpu (unsigned int gsi, int vector) | |||
655 | return cpu_physical_id(smp_processor_id()); | 655 | return cpu_physical_id(smp_processor_id()); |
656 | 656 | ||
657 | #ifdef CONFIG_ACPI | 657 | #ifdef CONFIG_ACPI |
658 | if (cpe_vector > 0 && vector == IA64_CPEP_VECTOR) | 658 | if (cpe_vector > 0 && vector == IA64_CPEP_VECTOR) |
659 | return get_cpei_target_cpu(); | 659 | return get_cpei_target_cpu(); |
660 | #endif | 660 | #endif |
661 | 661 | ||
662 | #ifdef CONFIG_NUMA | 662 | #ifdef CONFIG_NUMA |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 706b7734e191..c9562d94b9c3 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
@@ -36,7 +36,7 @@ int arch_register_cpu(int num) | |||
36 | parent = &sysfs_nodes[cpu_to_node(num)]; | 36 | parent = &sysfs_nodes[cpu_to_node(num)]; |
37 | #endif /* CONFIG_NUMA */ | 37 | #endif /* CONFIG_NUMA */ |
38 | 38 | ||
39 | #ifdef CONFIG_ACPI | 39 | #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) |
40 | /* | 40 | /* |
41 | * If CPEI cannot be re-targetted, and this is | 41 | * If CPEI cannot be re-targetted, and this is |
42 | * CPEI target, then dont create the control file | 42 | * CPEI target, then dont create the control file |