From mboxrd@z Thu Jan 1 00:00:00 1970 From: marc.zyngier@arm.com (Marc Zyngier) Date: Tue, 04 Oct 2011 10:44:38 +0100 Subject: [PATCH v4 02/10] ARM: SoC: Add per SoC SMP and CPU hotplug operations In-Reply-To: References: <1317663356-5114-1-git-send-email-marc.zyngier@arm.com> <1317663356-5114-3-git-send-email-marc.zyngier@arm.com> Message-ID: <4E8AD586.7060209@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 03/10/11 20:12, Nicolas Pitre wrote: > On Mon, 3 Oct 2011, Marc Zyngier wrote: > >> Populate the SoC descriptor structure with the SMP and CPU hotplug >> operations. To allow the kernel to continue building, the platform >> hooks are defined as weak symbols which are overrided by the >> platform code. Once all platforms are converted, the "weak" attribute >> will be removed and the function made static. >> >> Cc: Arnd Bergmann >> Cc: Nicolas Pitre >> Signed-off-by: Marc Zyngier >> --- > [...] >> --- a/arch/arm/kernel/setup.c >> +++ b/arch/arm/kernel/setup.c >> @@ -141,8 +141,12 @@ static const char *cpu_name; >> static const char *machine_name; >> static char __initdata cmd_line[COMMAND_LINE_SIZE]; >> struct machine_desc *machine_desc __initdata; >> -const struct arm_soc_desc *soc_desc; >> -static struct arm_soc_desc __soc_desc __read_mostly; >> +const struct arm_soc_desc *soc_desc __initdata; > > Does the above belong in this patch? Looks like a leftover from a previous rework. Will fix. >> +#ifdef CONFIG_SMP >> +const struct arm_soc_smp_init_ops *soc_smp_init_ops __initdata; >> +const struct arm_soc_smp_ops *soc_smp_ops __cpuinitdata; >> +static struct arm_soc_smp_ops __soc_smp_ops __cpuinitdata; >> +#endif > > Maybe those could be moved in smp.c instead. Good point, this actually makes a nice cleanup (the assignment of these variables can also move to smp.c, making them static). I'll repost the 3 affected patches shortly. Thanks for reviewing, M. -- Jazz is not dead. It just smells funny...