Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a8f3203 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Olof Johansson
Browse files

ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU 



When HOTPLUG_CPU is disabled, some fields in the smp operations
are not available or needed:

arch/arm/mach-milbeaut/platsmp.c:90:3: error: field designator 'cpu_die' does not refer to any field in type
      'struct smp_operations'
        .cpu_die                = m10v_cpu_die,
         ^
arch/arm/mach-milbeaut/platsmp.c:91:3: error: field designator 'cpu_kill' does not refer to any field in type
      'struct smp_operations'
        .cpu_kill               = m10v_cpu_kill,
         ^

Hide them in an #ifdef like the other platforms do.

Fixes: 9fb29c73 ("ARM: milbeaut: Add basic support for Milbeaut m10v SoC")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 2125801c

arch/arm/mach-milbeaut/platsmp.c

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus) 
		writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4);

}



#ifdef CONFIG_HOTPLUG_CPU

static void m10v_cpu_die(unsigned int l_cpu)

{

	gic_cpu_if_down(0);
@@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu) 


	return 1;

}

#endif



static struct smp_operations m10v_smp_ops __initdata = {

	.smp_prepare_cpus	= m10v_smp_init,

	.smp_boot_secondary	= m10v_boot_secondary,

#ifdef CONFIG_HOTPLUG_CPU

	.cpu_die		= m10v_cpu_die,

	.cpu_kill		= m10v_cpu_kill,

#endif

};

CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops);