diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
commit | 93510b46df6de7db4ca3f116ac1386b24d120566 (patch) | |
tree | 8fb61f128c11c3208721db79204fb3e170c4beb6 /arch/arm64/kernel/psci.c | |
parent | eb72e852c75d21ed6781027f0e3976bb7bd29f08 (diff) | |
parent | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-15.01
Diffstat (limited to 'arch/arm64/kernel/psci.c')
-rw-r--r-- | arch/arm64/kernel/psci.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index e58a67974f98..4d827dd62199 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -251,7 +251,7 @@ static void psci_sys_poweroff(void) * PSCI Function IDs for v0.2+ are well defined so use * standard values. */ -static int psci_0_2_init(struct device_node *np) +static int __init psci_0_2_init(struct device_node *np) { int err, ver; @@ -312,7 +312,7 @@ out_put_node: /* * PSCI < v0.2 get PSCI Function IDs via DT. */ -static int psci_0_1_init(struct device_node *np) +static int __init psci_0_1_init(struct device_node *np) { u32 id; int err; @@ -450,6 +450,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) return 0; } #endif +#endif #ifdef CONFIG_ARM64_CPU_SUSPEND static int cpu_psci_cpu_suspend(unsigned long index) @@ -465,6 +466,7 @@ static int cpu_psci_cpu_suspend(unsigned long index) const struct cpu_operations cpu_psci_ops = { .name = "psci", +#ifdef CONFIG_SMP .cpu_init = cpu_psci_cpu_init, .cpu_prepare = cpu_psci_cpu_prepare, .cpu_boot = cpu_psci_cpu_boot, @@ -473,9 +475,9 @@ const struct cpu_operations cpu_psci_ops = { .cpu_die = cpu_psci_cpu_die, .cpu_kill = cpu_psci_cpu_kill, #endif +#endif #ifdef CONFIG_ARM64_CPU_SUSPEND .cpu_suspend = cpu_psci_cpu_suspend, #endif }; -#endif |