diff options
author | Len Brown <len.brown@intel.com> | 2010-07-23 00:17:33 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-07-23 00:17:33 +0200 |
commit | 840ba24dd615e71154f0faab136b744c0a481041 (patch) | |
tree | 0b1a51b51b3b4220c8c0adf442c9551ad27d4b7c /drivers/acpi | |
parent | Linux 2.6.35-rc6 (diff) | |
parent | ACPI: processor: fix processor_physically_present on UP (diff) | |
download | linux-840ba24dd615e71154f0faab136b744c0a481041.tar.xz linux-840ba24dd615e71154f0faab136b744c0a481041.zip |
Merge branch 'bugzilla-16357' into release
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 51284351418f..e9699aaed109 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -223,7 +223,7 @@ static bool processor_physically_present(acpi_handle handle) type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0; cpuid = acpi_get_cpuid(handle, type, acpi_id); - if (cpuid == -1) + if ((cpuid == -1) && (num_possible_cpus() > 1)) return false; return true; |