Merge tag 'qcom-soc-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/soc

Merge "Qualcomm ARM Based SoC Updates for v3.15" from Kumar Gala:

* Add support for determining smp ops based on device tree.
* Add DT binding specs for Krait/Scorpion enable method
* Add DT binding specs for various Krait Processor controller complexes
* Add SoC SMP support for Krait Processor Subsystem v1 & v2

* tag 'qcom-soc-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Add SMP support for KPSSv2
  ARM: qcom: Add SMP support for KPSSv1
  devicetree: bindings: Document qcom,saw2 node
  devicetree: bindings: Document qcom,kpss-acc
  devicetree: bindings: Document Krait/Scorpion cpus and enable-method
  ARM: qcom: Re-organize platsmp to make it extensible
  ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp
  ARM: qcom: Rename various msm prefixed functions to qcom
  clocksource: qcom: split building of legacy vs multiplatform support
  ARM: qcom: Split Qualcomm support into legacy and multiplatform
  clocksource: qcom: Move clocksource code out of mach-msm
  ARM: msm: kill off hotplug.c
  ARM: msm: Remove pen_release usage
  ARM: dts: msm: split out msm8660 and msm8960 soc into dts include

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 10 insertions, 0 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index bc2121fa9132..bd02ca7a1d55 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -167,6 +167,15 @@
 #define CLK_OF_TABLES()
 #endif
 
+#ifdef CONFIG_SMP
+#define CPU_METHOD_OF_TABLES() . = ALIGN(8);                                \
+                           VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \
+                           *(__cpu_method_of_table)                         \
+                           VMLINUX_SYMBOL(__cpu_method_of_table_end) = .;
+#else
+#define CPU_METHOD_OF_TABLES()
+#endif
+
 #define KERNEL_DTB()                                                    \
         STRUCT_ALIGN();                                                 \
         VMLINUX_SYMBOL(__dtb_start) = .;                                \
@@ -491,6 +500,7 @@
         MEM_DISCARD(init.rodata)                                        \
         CLK_OF_TABLES()                                                 \
         CLKSRC_OF_TABLES()                                              \
+        CPU_METHOD_OF_TABLES()                                          \
         KERNEL_DTB()                                                    \
         IRQCHIP_OF_MATCH_TABLE()