Merge branch 'bugzilla-16357' into release

840ba24d · Len Brown · b37fa16e · 856b185d · 840ba24d
Commit 840ba24d authored Jul 22, 2010 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/acpi/processor_core.c drivers/acpi/processor_core.c +1 -1

No files found.
--- 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;