Merge tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / xen / xen-acpi-cpuhotplug.c

diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c
index 9eefbb0f79a3ab6f49403334b7ebfea6279026b1..757827966e3407facfac7c912ec762f292e0e385 100644 (file)
--- a/drivers/xen/xen-acpi-cpuhotplug.c
+++ b/drivers/xen/xen-acpi-cpuhotplug.c
@@ -113,7 +113,7 @@ static int __cpuinit xen_acpi_processor_add(struct acpi_device *device)
        return ret;
 }
 
-static int xen_acpi_processor_remove(struct acpi_device *device, int type)
+static int xen_acpi_processor_remove(struct acpi_device *device)
 {
        struct acpi_processor *pr;
 
@@ -251,7 +251,7 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
        if (acpi_bus_get_device(phandle, &pdev))
                return -ENODEV;
 
-       if (acpi_bus_add(device, pdev, handle, ACPI_BUS_TYPE_PROCESSOR))
+       if (acpi_bus_scan(handle))
                return -ENODEV;
 
        return 0;