aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_pdc.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index 23d2828157e0..974de4eb2982 100644
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -97,13 +97,11 @@ static struct acpi_object_list *acpi_processor_alloc_pdc(void)
97 * _PDC is required for a BIOS-OS handshake for most of the newer 97 * _PDC is required for a BIOS-OS handshake for most of the newer
98 * ACPI processor features. 98 * ACPI processor features.
99 */ 99 */
100static int acpi_processor_eval_pdc(struct acpi_processor *pr) 100static int
101acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
101{ 102{
102 struct acpi_object_list *pdc_in = pr->pdc;
103 acpi_status status = AE_OK; 103 acpi_status status = AE_OK;
104 104
105 if (!pdc_in)
106 return status;
107 if (idle_nomwait) { 105 if (idle_nomwait) {
108 /* 106 /*
109 * If mwait is disabled for CPU C-states, the C2C3_FFH access 107 * If mwait is disabled for CPU C-states, the C2C3_FFH access
@@ -118,7 +116,7 @@ static int acpi_processor_eval_pdc(struct acpi_processor *pr)
118 buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); 116 buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH);
119 117
120 } 118 }
121 status = acpi_evaluate_object(pr->handle, "_PDC", pdc_in, NULL); 119 status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL);
122 120
123 if (ACPI_FAILURE(status)) 121 if (ACPI_FAILURE(status))
124 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 122 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -148,9 +146,7 @@ void acpi_processor_set_pdc(struct acpi_processor *pr)
148 if (!obj_list) 146 if (!obj_list)
149 return; 147 return;
150 148
151 pr->pdc = obj_list; 149 acpi_processor_eval_pdc(pr->handle, obj_list);
152
153 acpi_processor_eval_pdc(pr);
154 acpi_processor_cleanup_pdc(pr); 150 acpi_processor_cleanup_pdc(pr);
155} 151}
156EXPORT_SYMBOL_GPL(acpi_processor_set_pdc); 152EXPORT_SYMBOL_GPL(acpi_processor_set_pdc);