Merge back earlier 'acpi-assorted' material

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / processor_driver.c

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 94b7b3b5559e27b852d645c38d3333976259c5d0..bd11ef93b0ceb943b821528b943579884b410c15 100644 (file)
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -114,9 +114,9 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
        return;
 }
 
-static __cpuinit int __acpi_processor_start(struct acpi_device *device);
+static int __acpi_processor_start(struct acpi_device *device);
 
-static int __cpuinit acpi_cpu_soft_notify(struct notifier_block *nfb,
+static int acpi_cpu_soft_notify(struct notifier_block *nfb,
                                          unsigned long action, void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;
@@ -158,7 +158,7 @@ static struct notifier_block __refdata acpi_cpu_notifier =
            .notifier_call = acpi_cpu_soft_notify,
 };
 
-static __cpuinit int __acpi_processor_start(struct acpi_device *device)
+static int __acpi_processor_start(struct acpi_device *device)
 {
        struct acpi_processor *pr = acpi_driver_data(device);
        acpi_status status;
@@ -222,7 +222,7 @@ static __cpuinit int __acpi_processor_start(struct acpi_device *device)
        return result;
 }
 
-static int __cpuinit acpi_processor_start(struct device *dev)
+static int acpi_processor_start(struct device *dev)
 {
        struct acpi_device *device;