Merge with Linus' kernel.

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 0c561c571f29..1278aca96fe3 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -748,7 +748,7 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
                 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);
 }
@@ -788,13 +788,13 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
                 }
 
                 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))) {
-                        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",
@@ -818,7 +818,7 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
                 }
 
                 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,