Skip to contentSkip to conversation

ARM: hisi: fix hip04 build without HOTPLUG_CPU

PATCH New Arnd Bergmann 3 participants 3 messages May 19, 2015 – May 20, 2015

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/HiSilicon SoC support
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

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

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.

Signed-off-by Arnd Bergmann <[email protected]>
Fixes 905cdf9dda5d ("ARM: hisi/hip04: remove the MCPM overhead")

---
The patch causing this is currently part of rmk's devel-stable branch.

arch/arm/mach-hisi/platmcpm.c +4 -0
index 880cbfa9c343..b5f8f5ffda79 100644
@@ -152,6 +152,7 @@ out:
 	return 0;
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void hip04_cpu_die(unsigned int l_cpu)
 {
 	unsigned int mpidr, cpu, cluster;

@@ -236,11 +237,14 @@ err:
 	spin_unlock_irq(&boot_lock);
 	return 0;
 }
+#endif
 
 static struct smp_operations __initdata hip04_smp_ops = {
 	.smp_boot_secondary	= hip04_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
 	.cpu_die		= hip04_cpu_die,
 	.cpu_kill		= hip04_cpu_kill,
+#endif
 };
 
 static bool __init hip04_cpu_table_init(void)
#1 lore raw

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

Quoted 8 lines · Arnd Bergmann

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

Quoted 5 lines

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

Signed-off-by Arnd Bergmann <[email protected]>
Fixes 905cdf9dda5d ("ARM: hisi/hip04: remove the MCPM overhead")
Acked-by Nicolas Pitre <[email protected]>
Quoted 32 lines

---
The patch causing this is currently part of rmk's devel-stable branch.

arch/arm/mach-hisi/platmcpm.c +4 -0
index 880cbfa9c343..b5f8f5ffda79 100644
@@ -152,6 +152,7 @@ out:
 	return 0;
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void hip04_cpu_die(unsigned int l_cpu)
 {
 	unsigned int mpidr, cpu, cluster;

@@ -236,11 +237,14 @@ err:
 	spin_unlock_irq(&boot_lock);
 	return 0;
 }
+#endif
 
 static struct smp_operations __initdata hip04_smp_ops = {
 	.smp_boot_secondary	= hip04_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
 	.cpu_die		= hip04_cpu_die,
 	.cpu_kill		= hip04_cpu_kill,
+#endif
 };
 
 static bool __init hip04_cpu_table_init(void)
maintainer
#2 lore raw

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

In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

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

Quoted 5 lines

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

Signed-off-by Arnd Bergmann <[email protected]>
Fixes 905cdf9dda5d ("ARM: hisi/hip04: remove the MCPM overhead")

Hi Arnd,

Thanks!

Best Regards,
Wei

Quoted 34 lines

---
The patch causing this is currently part of rmk's devel-stable branch.

arch/arm/mach-hisi/platmcpm.c +4 -0
index 880cbfa9c343..b5f8f5ffda79 100644
@@ -152,6 +152,7 @@ out:
 	return 0;
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void hip04_cpu_die(unsigned int l_cpu)
 {
 	unsigned int mpidr, cpu, cluster;

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

.