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

Commit 9a721c41 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: align cpu_method_of_table naming 



The cpu_method_of_table is the oddball of the various OF linker sections.
In preparation to have common linker section definitions, align the
cpu_method_of_table with the other definitions for the naming and ending
with a blank struct.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
parent 735e0da7

arch/arm/kernel/devtree.c

+7 −4
Original line number Diff line number Diff line
@@ -33,18 +33,21 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) 
}



#ifdef CONFIG_SMP

extern struct of_cpu_method __cpu_method_of_table_begin[];

extern struct of_cpu_method __cpu_method_of_table_end[];

extern struct of_cpu_method __cpu_method_of_table[];



static const struct of_cpu_method __cpu_method_of_table_sentinel

	__used __section(__cpu_method_of_table_end);





static int __init set_smp_ops_by_method(struct device_node *node)

{

	const char *method;

	struct of_cpu_method *m = __cpu_method_of_table_begin;

	struct of_cpu_method *m = __cpu_method_of_table;



	if (of_property_read_string(node, "enable-method", &method))

		return 0;



	for (; m < __cpu_method_of_table_end; m++)

	for (; m->method; m++)

		if (!strcmp(m->method, method)) {

			smp_set_ops(m->ops);

			return 1;

include/asm-generic/vmlinux.lds.h

+2 −2
Original line number Diff line number Diff line
@@ -179,9 +179,9 @@ 


#ifdef CONFIG_SMP

#define CPU_METHOD_OF_TABLES() . = ALIGN(8);				    \

			   VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \

			   VMLINUX_SYMBOL(__cpu_method_of_table) = .; \

			   *(__cpu_method_of_table)			    \

			   VMLINUX_SYMBOL(__cpu_method_of_table_end) = .;

			   *(__cpu_method_of_table_end)

#else

#define CPU_METHOD_OF_TABLES()

#endif