GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 12:45:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU

Browse source 
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: 9fb29c734f ("ARM: milbeaut: Add basic support for Milbeaut m10v SoC")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Arnd Bergmann 2019-03-13 22:19:16 +01:00 • committed by Olof Johansson
parent 2125801ccc
commit 9a8f32038a
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-milbeaut/platsmp.c
View file

@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus)
writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4); writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4);
} }
#ifdef CONFIG_HOTPLUG_CPU
static void m10v_cpu_die(unsigned int l_cpu) static void m10v_cpu_die(unsigned int l_cpu)
{ {
gic_cpu_if_down(0); gic_cpu_if_down(0);
@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu)
return 1; return 1;
} }
#endif
static struct smp_operations m10v_smp_ops __initdata = { static struct smp_operations m10v_smp_ops __initdata = {
.smp_prepare_cpus = m10v_smp_init, .smp_prepare_cpus = m10v_smp_init,
.smp_boot_secondary = m10v_boot_secondary, .smp_boot_secondary = m10v_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_die = m10v_cpu_die, .cpu_die = m10v_cpu_die,
.cpu_kill = m10v_cpu_kill, .cpu_kill = m10v_cpu_kill,
#endif
}; };
CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops); CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops);