Merge branch 'bugzilla-16357' into release

git-mirror · Jul 22, 2010 · 840ba24 · 840ba24
2 parents b37fa16 + 856b185
commit 840ba24
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;