git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/src/linux-2.6/
[pandora-kernel.git]
/
drivers
/
acpi
/
processor_core.c
diff --git
a/drivers/acpi/processor_core.c
b/drivers/acpi/processor_core.c
index
0c561c5
..
99a3a28
100644
(file)
--- a/
drivers/acpi/processor_core.c
+++ b/
drivers/acpi/processor_core.c
@@
-253,31
+253,21
@@
static int acpi_processor_errata(struct acpi_processor *pr)
* _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features.
*/
* _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features.
*/
-
-int acpi_processor_set_pdc(struct acpi_processor *pr,
- struct acpi_object_list *pdc_in)
+static int acpi_processor_set_pdc(struct acpi_processor *pr)
{
{
+ struct acpi_object_list *pdc_in = pr->pdc;
acpi_status status = AE_OK;
acpi_status status = AE_OK;
- u32 arg0_buf[3];
- union acpi_object arg0 = { ACPI_TYPE_BUFFER };
- struct acpi_object_list no_object = { 1, &arg0 };
- struct acpi_object_list *pdc;
ACPI_FUNCTION_TRACE("acpi_processor_set_pdc");
ACPI_FUNCTION_TRACE("acpi_processor_set_pdc");
- arg0.buffer.length = 12;
- arg0.buffer.pointer = (u8 *) arg0_buf;
- arg0_buf[0] = ACPI_PDC_REVISION_ID;
- arg0_buf[1] = 0;
- arg0_buf[2] = 0;
-
- pdc = (pdc_in) ? pdc_in : &no_object;
+ if (!pdc_in)
+ return_VALUE(status);
- status = acpi_evaluate_object(pr->handle, "_PDC", pdc, NULL);
+ status = acpi_evaluate_object(pr->handle, "_PDC", pdc
_in
, NULL);
- if (
(ACPI_FAILURE(status)) && (pdc_in
))
+ if (
ACPI_FAILURE(status
))
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-
"Error evaluating
_PDC, using legacy perf. control...\n"));
+
"Could not evaluate
_PDC, using legacy perf. control...\n"));
return_VALUE(status);
}
return_VALUE(status);
}
@@
-357,7
+347,6
@@
static int acpi_processor_add_fs(struct acpi_device *device)
ACPI_PROCESSOR_FILE_THROTTLING));
else {
entry->proc_fops = &acpi_processor_throttling_fops;
ACPI_PROCESSOR_FILE_THROTTLING));
else {
entry->proc_fops = &acpi_processor_throttling_fops;
- entry->proc_fops->write = acpi_processor_write_throttling;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
@@
-372,7
+361,6
@@
static int acpi_processor_add_fs(struct acpi_device *device)
ACPI_PROCESSOR_FILE_LIMIT));
else {
entry->proc_fops = &acpi_processor_limit_fops;
ACPI_PROCESSOR_FILE_LIMIT));
else {
entry->proc_fops = &acpi_processor_limit_fops;
- entry->proc_fops->write = acpi_processor_write_limit;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
@@
-589,6
+577,10
@@
static int acpi_processor_start(struct acpi_device *device)
"Error installing device notify handler\n"));
}
"Error installing device notify handler\n"));
}
+ /* _PDC call should be done before doing anything else (if reqd.). */
+ arch_acpi_processor_init_pdc(pr);
+ acpi_processor_set_pdc(pr);
+
acpi_processor_power_init(pr, device);
if (pr->flags.throttling) {
acpi_processor_power_init(pr, device);
if (pr->flags.throttling) {
@@
-748,7
+740,7
@@
int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
return_VALUE(-ENODEV);
if ((pr->id >= 0) && (pr->id < NR_CPUS)) {
return_VALUE(-ENODEV);
if ((pr->id >= 0) && (pr->id < NR_CPUS)) {
- kobject_
hotplug
(&(*device)->kobj, KOBJ_ONLINE);
+ kobject_
uevent
(&(*device)->kobj, KOBJ_ONLINE);
}
return_VALUE(0);
}
}
return_VALUE(0);
}
@@
-788,13
+780,13
@@
acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
}
if (pr->id >= 0 && (pr->id < NR_CPUS)) {
}
if (pr->id >= 0 && (pr->id < NR_CPUS)) {
- kobject_
hotplug
(&device->kobj, KOBJ_OFFLINE);
+ kobject_
uevent
(&device->kobj, KOBJ_OFFLINE);
break;
}
result = acpi_processor_start(device);
if ((!result) && ((pr->id >= 0) && (pr->id < NR_CPUS))) {
break;
}
result = acpi_processor_start(device);
if ((!result) && ((pr->id >= 0) && (pr->id < NR_CPUS))) {
- kobject_
hotplug
(&device->kobj, KOBJ_ONLINE);
+ kobject_
uevent
(&device->kobj, KOBJ_ONLINE);
} else {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Device [%s] failed to start\n",
} else {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Device [%s] failed to start\n",
@@
-818,7
+810,7
@@
acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
}
if ((pr->id < NR_CPUS) && (cpu_present(pr->id)))
}
if ((pr->id < NR_CPUS) && (cpu_present(pr->id)))
- kobject_
hotplug
(&device->kobj, KOBJ_OFFLINE);
+ kobject_
uevent
(&device->kobj, KOBJ_OFFLINE);
break;
default:
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
break;
default:
ACPI_DEBUG_PRINT((ACPI_DB_INFO,