diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2005-10-21 19:22:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-11-30 23:28:50 -0500 |
| commit | cd8e2b48daee891011a4f21e2c62b210d24dcc9e (patch) | |
| tree | 8e02739b3c56ca19f8534ebc238b08619a4a40ac | |
| parent | d2149b542382bfc206cb28485108f6470c979566 (diff) | |
| download | linux-cd8e2b48daee891011a4f21e2c62b210d24dcc9e.tar.gz | |
[ACPI] fix 2.6.13 boot hang regression on HT box w/ broken BIOS
http://bugzilla.kernel.org/show_bug.cgi?id=5452
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/processor_core.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 4217925626423d..0c561c571f29a4 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -543,6 +543,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr) return_VALUE(0); } +static void *processor_device_array[NR_CPUS]; + static int acpi_processor_start(struct acpi_device *device) { int result = 0; @@ -561,6 +563,19 @@ static int acpi_processor_start(struct acpi_device *device) BUG_ON((pr->id >= NR_CPUS) || (pr->id < 0)); + /* + * Buggy BIOS check + * ACPI id of processors can be reported wrongly by the BIOS. + * Don't trust it blindly + */ + if (processor_device_array[pr->id] != NULL && + processor_device_array[pr->id] != (void *)device) { + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting wrong ACPI id" + "for the processor\n")); + return_VALUE(-ENODEV); + } + processor_device_array[pr->id] = (void *)device; + processors[pr->id] = pr; result = acpi_processor_add_fs(device); |