diff options
-rw-r--r-- | drivers/acpi/processor_core.c | 9 | ||||
-rw-r--r-- | drivers/acpi/processor_driver.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 3c1a2fec8cda..ac77dde39199 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT | 19 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT |
20 | ACPI_MODULE_NAME("processor_core"); | 20 | ACPI_MODULE_NAME("processor_core"); |
21 | 21 | ||
22 | static int set_no_mwait(const struct dmi_system_id *id) | 22 | static int __init set_no_mwait(const struct dmi_system_id *id) |
23 | { | 23 | { |
24 | printk(KERN_NOTICE PREFIX "%s detected - " | 24 | printk(KERN_NOTICE PREFIX "%s detected - " |
25 | "disabling mwait for CPU C-states\n", id->ident); | 25 | "disabling mwait for CPU C-states\n", id->ident); |
@@ -27,7 +27,7 @@ static int set_no_mwait(const struct dmi_system_id *id) | |||
27 | return 0; | 27 | return 0; |
28 | } | 28 | } |
29 | 29 | ||
30 | static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { | 30 | static struct dmi_system_id __initdata processor_idle_dmi_table[] = { |
31 | { | 31 | { |
32 | set_no_mwait, "Extensa 5220", { | 32 | set_no_mwait, "Extensa 5220", { |
33 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), | 33 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), |
@@ -183,7 +183,7 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) | |||
183 | EXPORT_SYMBOL_GPL(acpi_get_cpuid); | 183 | EXPORT_SYMBOL_GPL(acpi_get_cpuid); |
184 | #endif | 184 | #endif |
185 | 185 | ||
186 | static bool processor_physically_present(acpi_handle handle) | 186 | static bool __init processor_physically_present(acpi_handle handle) |
187 | { | 187 | { |
188 | int cpuid, type; | 188 | int cpuid, type; |
189 | u32 acpi_id; | 189 | u32 acpi_id; |
@@ -323,9 +323,8 @@ void acpi_processor_set_pdc(acpi_handle handle) | |||
323 | kfree(obj_list->pointer); | 323 | kfree(obj_list->pointer); |
324 | kfree(obj_list); | 324 | kfree(obj_list); |
325 | } | 325 | } |
326 | EXPORT_SYMBOL_GPL(acpi_processor_set_pdc); | ||
327 | 326 | ||
328 | static acpi_status | 327 | static acpi_status __init |
329 | early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) | 328 | early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) |
330 | { | 329 | { |
331 | if (processor_physically_present(handle) == false) | 330 | if (processor_physically_present(handle) == false) |
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 360a74e6add0..a4e0f1ba6040 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c | |||
@@ -635,8 +635,8 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device) | |||
635 | return 0; | 635 | return 0; |
636 | } | 636 | } |
637 | 637 | ||
638 | static void __ref acpi_processor_hotplug_notify(acpi_handle handle, | 638 | static void acpi_processor_hotplug_notify(acpi_handle handle, |
639 | u32 event, void *data) | 639 | u32 event, void *data) |
640 | { | 640 | { |
641 | struct acpi_processor *pr; | 641 | struct acpi_processor *pr; |
642 | struct acpi_device *device = NULL; | 642 | struct acpi_device *device = NULL; |