diff options
| author | Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com> | 2007-02-12 10:51:23 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-12 10:51:23 -0500 |
| commit | 615d5f235b6c402ca01098a828c3d67e79e57cb6 (patch) | |
| tree | b47de1f1ea4662eb90f44860b593eeded2d8d9dc /drivers/acpi | |
| parent | 359acec8cd78d35e64147565e28b516599066e08 (diff) | |
| download | kernel-crypto-615d5f235b6c402ca01098a828c3d67e79e57cb6.tar.gz kernel-crypto-615d5f235b6c402ca01098a828c3d67e79e57cb6.tar.xz kernel-crypto-615d5f235b6c402ca01098a828c3d67e79e57cb6.zip | |
ACPI: IA64: fix calculation of apic_id
fix regression from recent table re-write
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 0079bc51082..61d976e7af5 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -404,7 +404,7 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, if (lsapic->lapic_flags & ACPI_MADT_ENABLED) { /* First check against id */ if (lsapic->processor_id == acpi_id) { - *apic_id = lsapic->id; + *apic_id = (lsapic->id << 8) | lsapic->eid; return 1; /* Check against optional uid */ } else if (entry->length >= 16 && |