diff options
author | Alex Chiang <achiang@hp.com> | 2008-04-29 18:05:29 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-04-29 18:05:29 -0400 |
commit | fe086a7bea7ab714930bd48addba961ceeef7634 (patch) | |
tree | 9595c1876f94a81a19166cc4eeb3fac84a895f5e /arch/ia64/kernel/topology.c | |
parent | 6ff0bc94eee96fe45e5caa338c8b03cb99431fa9 (diff) |
[IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
Legacy HP ia64 platforms currently cannot provide
/proc/cpuinfo/physical_id due to legacy SAL/PAL implementations.
However, that physical topology information can be obtained
via ACPI.
Provide an interface that gives ACPI one last chance to provide
physical_id for these legacy platforms. This logic only comes
into play iff:
- ACPI actually provides slot information for the CPU
- we lack a valid socket_id
Otherwise, we don't do anything.
Since x86 uses the ACPI processor driver as well, we provide a nop
stub function for arch_fix_phys_package_id() in asm-x86/topology.h
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/topology.c')
-rw-r--r-- | arch/ia64/kernel/topology.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index a2484fc1a06c..abb17a613b17 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
@@ -27,6 +27,15 @@ | |||
27 | 27 | ||
28 | static struct ia64_cpu *sysfs_cpus; | 28 | static struct ia64_cpu *sysfs_cpus; |
29 | 29 | ||
30 | void arch_fix_phys_package_id(int num, u32 slot) | ||
31 | { | ||
32 | #ifdef CONFIG_SMP | ||
33 | if (cpu_data(num)->socket_id == -1) | ||
34 | cpu_data(num)->socket_id = slot; | ||
35 | #endif | ||
36 | } | ||
37 | EXPORT_SYMBOL_GPL(arch_fix_phys_package_id); | ||
38 | |||
30 | int arch_register_cpu(int num) | 39 | int arch_register_cpu(int num) |
31 | { | 40 | { |
32 | #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) | 41 | #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) |