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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>

2 files changed, 9 insertions, 6 deletions

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 3e5a2056a466..ea9ce92a4b52 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -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;
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index b1c6f9d0c4ff..fe57c5f1bd1a 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -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