Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fdeb94b5dc5bf9db7b3e36f3f38089a554f6a108

Authored by Arnd Bergmann
Committed by Russell King
1 parent 78ecad0183
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ARM: 7745/1: psci: fix building without HOTPLUG_CPU 

The cpu_die field in smp_operations is not valid with CONFIG_HOTPLUG_CPU,
so we must enclose it in #ifdef, but at least that lets us remove
two other lines.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/arm/kernel/psci_smp.c
Diff comments   View file @ fdeb94b
... ... @@ -68,8 +68,6 @@
68 68 /* We should never return */
69 69 panic("psci: cpu %d failed to shutdown\n", cpu);
70 70 }
71   -#else
72   -#define psci_cpu_die NULL
73 71 #endif
74 72  
75 73 bool __init psci_smp_available(void)
76 74  
... ... @@ -80,6 +78,8 @@
80 78  
81 79 struct smp_operations __initdata psci_smp_ops = {
82 80 .smp_boot_secondary = psci_boot_secondary,
  81 +#ifdef CONFIG_HOTPLUG_CPU
83 82 .cpu_die = psci_cpu_die,
  83 +#endif
84 84 };