Commit 8264dde5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Olof Johansson

ARM: tango: fix CONFIG_HOTPLUG_CPU=n build

Building with CONFIG_HOTPLUG_CPU disabled fails for mach-tango:

include/linux/stddef.h:7:14: error: excess elements in struct initializer [-Werror]
 #define NULL ((void *)0)
arch/arm/mach-tango/platsmp.c:48:15: note: in expansion of macro 'tango_cpu_kill'
  .cpu_kill  = tango_cpu_kill,

the problem as that the .cpu_kill and .cpu_die struct members are
unavailable and we must not try to assign them in this configuration.

Hiding the two (as all other platforms do too) lets us get rid of
the #else clause as well.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 7c2d780e
......@@ -38,15 +38,14 @@ static void tango_cpu_die(unsigned int cpu)
panic("cpu %d failed to die\n", cpu);
}
#else
#define tango_cpu_kill NULL
#define tango_cpu_die NULL
#endif
static const struct smp_operations tango_smp_ops __initconst = {
.smp_boot_secondary = tango_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_kill = tango_cpu_kill,
.cpu_die = tango_cpu_die,
#endif
};
CPU_METHOD_OF_DECLARE(tango4_smp, "sigma,tango4-smp", &tango_smp_ops);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment