diff options
-rw-r--r-- | drivers/acpi/processor_core.c | 2 | ||||
-rw-r--r-- | drivers/acpi/processor_pdc.c | 18 | ||||
-rw-r--r-- | include/acpi/processor.h | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index a19a4ff962ea..9863c98c81ba 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -763,7 +763,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) | |||
763 | } | 763 | } |
764 | 764 | ||
765 | /* _PDC call should be done before doing anything else (if reqd.). */ | 765 | /* _PDC call should be done before doing anything else (if reqd.). */ |
766 | acpi_processor_set_pdc(pr); | 766 | acpi_processor_set_pdc(pr->handle); |
767 | 767 | ||
768 | #ifdef CONFIG_CPU_FREQ | 768 | #ifdef CONFIG_CPU_FREQ |
769 | acpi_processor_ppc_has_changed(pr, 0); | 769 | acpi_processor_ppc_has_changed(pr, 0); |
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c index deeba22c932c..30e4dc0cdf30 100644 --- a/drivers/acpi/processor_pdc.c +++ b/drivers/acpi/processor_pdc.c | |||
@@ -125,7 +125,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in) | |||
125 | return status; | 125 | return status; |
126 | } | 126 | } |
127 | 127 | ||
128 | void acpi_processor_set_pdc(struct acpi_processor *pr) | 128 | void acpi_processor_set_pdc(acpi_handle handle) |
129 | { | 129 | { |
130 | struct acpi_object_list *obj_list; | 130 | struct acpi_object_list *obj_list; |
131 | 131 | ||
@@ -136,7 +136,7 @@ void acpi_processor_set_pdc(struct acpi_processor *pr) | |||
136 | if (!obj_list) | 136 | if (!obj_list) |
137 | return; | 137 | return; |
138 | 138 | ||
139 | acpi_processor_eval_pdc(pr->handle, obj_list); | 139 | acpi_processor_eval_pdc(handle, obj_list); |
140 | 140 | ||
141 | kfree(obj_list->pointer->buffer.pointer); | 141 | kfree(obj_list->pointer->buffer.pointer); |
142 | kfree(obj_list->pointer); | 142 | kfree(obj_list->pointer); |
@@ -147,19 +147,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_set_pdc); | |||
147 | static acpi_status | 147 | static acpi_status |
148 | early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) | 148 | early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) |
149 | { | 149 | { |
150 | struct acpi_processor pr; | 150 | acpi_processor_set_pdc(handle); |
151 | |||
152 | pr.handle = handle; | ||
153 | |||
154 | /* x86 implementation looks at pr.id to determine some | ||
155 | * CPU capabilites. We can just hard code to 0 since we're | ||
156 | * assuming the CPUs in the system are homogenous and all | ||
157 | * have the same capabilities. | ||
158 | */ | ||
159 | pr.id = 0; | ||
160 | |||
161 | acpi_processor_set_pdc(&pr); | ||
162 | |||
163 | return AE_OK; | 151 | return AE_OK; |
164 | } | 152 | } |
165 | 153 | ||
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 0873cd57510c..7cc433d69932 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -323,7 +323,7 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit) | |||
323 | #endif /* CONFIG_CPU_FREQ */ | 323 | #endif /* CONFIG_CPU_FREQ */ |
324 | 324 | ||
325 | /* in processor_pdc.c */ | 325 | /* in processor_pdc.c */ |
326 | void acpi_processor_set_pdc(struct acpi_processor *pr); | 326 | void acpi_processor_set_pdc(acpi_handle handle); |
327 | 327 | ||
328 | /* in processor_throttling.c */ | 328 | /* in processor_throttling.c */ |
329 | int acpi_processor_tstate_has_changed(struct acpi_processor *pr); | 329 | int acpi_processor_tstate_has_changed(struct acpi_processor *pr); |