aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/psci.c
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-09-17 16:13:36 +0100
committerJon Medhurst <tixy@linaro.org>2014-03-31 13:58:18 +0100
commit9d49e12b6a8465e918ca8798d29fd3a62074d1ca (patch)
tree2c5d0655fd132bb14d9a6373414fd00347531d36 /arch/arm/kernel/psci.c
parent83abf76f81fc8b0602e23afb0650e26eb89090b4 (diff)
ARM: psci: Remove __init from psci_probe()
To allow it to be used without section mismatch warnings from non __init functions. Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/kernel/psci.c')
-rw-r--r--arch/arm/kernel/psci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
index 1984d7bf725..e2c3fa8632e 100644
--- a/arch/arm/kernel/psci.c
+++ b/arch/arm/kernel/psci.c
@@ -156,7 +156,7 @@ static int psci_migrate(unsigned long cpuid)
return psci_to_linux_errno(err);
}
-static const struct of_device_id psci_of_match[] __initconst = {
+static const struct of_device_id psci_of_match[] = {
{ .compatible = "arm,psci", },
{},
};
@@ -212,7 +212,7 @@ out_put_node:
return;
}
-int __init psci_probe(void)
+int psci_probe(void)
{
struct device_node *np;
int ret = -ENODEV;