diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 16:50:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 16:50:49 -0700 |
| commit | 33ae0cdd3eaba219e7c2f0647b6db4be540e2130 (patch) | |
| tree | 1d0cb11644b40b500ad98e7af3bcac78012dec59 /drivers/acpi | |
| parent | f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259 (diff) | |
| parent | fe086a7bea7ab714930bd48addba961ceeef7634 (diff) | |
| download | kernel_samsung_espresso10-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.zip kernel_samsung_espresso10-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.tar.gz kernel_samsung_espresso10-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
[IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
[IA64] allocate multiple contiguous pages via uncached allocator
[IA64] bugfix: nptcg breaks cpu-hotadd
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index dd28c91..5241e3f 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -603,6 +603,15 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid) request_region(pr->throttling.address, 6, "ACPI CPU throttle"); } + /* + * If ACPI describes a slot number for this CPU, we can use it + * ensure we get the right value in the "physical id" field + * of /proc/cpuinfo + */ + status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer); + if (ACPI_SUCCESS(status)) + arch_fix_phys_package_id(pr->id, object.integer.value); + return 0; } |