diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
| commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
| tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/acpi/processor_core.c | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
| parent | 0539771d7236b425f285652f6f297cc7939c8f9a (diff) | |
Pull misc-for-upstream into release branch
Conflicts:
drivers/usb/misc/appledisplay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/processor_core.c')
| -rw-r--r-- | drivers/acpi/processor_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 0079bc51082c..4b3d15fa507a 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 && @@ -1005,7 +1005,7 @@ static int __init acpi_processor_init(void) #ifdef CONFIG_SMP if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0, (struct acpi_table_header **)&madt))) - madt = 0; + madt = NULL; #endif acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir); |