iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: 8370/1: hisi: fix hip04 build without HOTPLUG_CPU

Browse Source 
The hip04 smp implementation provides the hotplug operations (cpu_die
and cpu_kill) unconditionally at the moment, which leads to a build
error when HOTPLUG_CPU is disabled:

mach-hisi/platmcpm.c:242:13: note: (near initialization for 'hip04_smp_ops')
mach-hisi/platmcpm.c:242:2: error: unknown field 'cpu_die' specified in initializer
mach-hisi/platmcpm.c:243:2: error: unknown field 'cpu_kill' specified in initializer

This uses an #ifdef to remove the code from the build when that
option is not set.

Fixes: 905cdf9dda5d ("ARM: hisi/hip04: remove the MCPM overhead")

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Pitre <nico@xxxxxxxxxx>
Acked-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Arnd Bergmann 2015-05-23 09:31:54 +01:00 committed by Russell King
parent 7895f73169
commit 4c9e0f76a5
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-hisi/platmcpm.c
View File

@ -152,6 +152,7 @@ out:
return 0; return 0;
} }
#ifdef CONFIG_HOTPLUG_CPU
static void hip04_cpu_die(unsigned int l_cpu) static void hip04_cpu_die(unsigned int l_cpu)
{ {
unsigned int mpidr, cpu, cluster; unsigned int mpidr, cpu, cluster;
@ -236,11 +237,14 @@ err:
spin_unlock_irq(&boot_lock); spin_unlock_irq(&boot_lock);
return 0; return 0;
} }
#endif
static struct smp_operations __initdata hip04_smp_ops = { static struct smp_operations __initdata hip04_smp_ops = {
.smp_boot_secondary = hip04_boot_secondary, .smp_boot_secondary = hip04_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_die = hip04_cpu_die, .cpu_die = hip04_cpu_die,
.cpu_kill = hip04_cpu_kill, .cpu_kill = hip04_cpu_kill,
#endif
}; };
static bool __init hip04_cpu_table_init(void) static bool __init hip04_cpu_table_init(void)