diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /drivers/acpi/processor_pdc.c | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'drivers/acpi/processor_pdc.c')
| -rw-r--r-- | drivers/acpi/processor_pdc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c index e5dd80800930..7cfbda4d7c51 100644 --- a/drivers/acpi/processor_pdc.c +++ b/drivers/acpi/processor_pdc.c | |||
| @@ -52,10 +52,7 @@ static bool __init processor_physically_present(acpi_handle handle) | |||
| 52 | type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0; | 52 | type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0; |
| 53 | cpuid = acpi_get_cpuid(handle, type, acpi_id); | 53 | cpuid = acpi_get_cpuid(handle, type, acpi_id); |
| 54 | 54 | ||
| 55 | if (cpuid == -1) | 55 | return !invalid_logical_cpuid(cpuid); |
| 56 | return false; | ||
| 57 | |||
| 58 | return true; | ||
| 59 | } | 56 | } |
| 60 | 57 | ||
| 61 | static void acpi_set_pdc_bits(u32 *buf) | 58 | static void acpi_set_pdc_bits(u32 *buf) |