Commit 8264dde5 authored Jul 06, 2016 by Arnd Bergmann Committed by Olof Johansson Jul 06, 2016

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 7c2d780e

arch/arm/mach-tango/platsmp.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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);