kernel: update 3.14 to 3.14.18

[openwrt/svn-archive/archive.git] / target / linux / ipq806x / patches / 0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch

diff --git a/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch b/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch
index 66f667c2a8cccc6fce553bd8f1cbbe99def04c36..e1d9ae1ac68fedf9836f1cc3b60fc4cb4cbc857c 100644 (file)
--- a/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch
+++ b/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch
@@ -15,8 +15,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org>
  arch/arm/mach-qcom/scm-boot.h |    8 ++--
  2 files changed, 111 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
-index ec8604d..cb0783f 100644
 --- a/arch/arm/mach-qcom/platsmp.c
 +++ b/arch/arm/mach-qcom/platsmp.c
 @@ -26,6 +26,16 @@
@@ -36,7 +34,7 @@ index ec8604d..cb0783f 100644
  extern void secondary_startup(void);
  
  static DEFINE_SPINLOCK(boot_lock);
-@@ -71,6 +81,85 @@ static int scss_release_secondary(unsigned int cpu)
+@@ -71,6 +81,85 @@ static int scss_release_secondary(unsign
        return 0;
  }
  
@@ -122,7 +120,7 @@ index ec8604d..cb0783f 100644
  static DEFINE_PER_CPU(int, cold_boot_done);
  
  static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
-@@ -110,6 +199,11 @@ static int msm8660_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -110,6 +199,11 @@ static int msm8660_boot_secondary(unsign
        return qcom_boot_secondary(cpu, scss_release_secondary);
  }
  
@@ -134,7 +132,7 @@ index ec8604d..cb0783f 100644
  static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)
  {
        int cpu, map;
-@@ -117,6 +211,8 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)
+@@ -117,6 +211,8 @@ static void __init qcom_smp_prepare_cpus
        static const int cold_boot_flags[] = {
                0,
                SCM_FLAG_COLDBOOT_CPU1,
@@ -143,7 +141,7 @@ index ec8604d..cb0783f 100644
        };
  
        for_each_present_cpu(cpu) {
-@@ -147,3 +243,13 @@ static struct smp_operations smp_msm8660_ops __initdata = {
+@@ -147,3 +243,13 @@ static struct smp_operations smp_msm8660
  #endif
  };
  CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops);
@@ -157,8 +155,6 @@ index ec8604d..cb0783f 100644
 +#endif
 +};
 +CPU_METHOD_OF_DECLARE(qcom_smp_kpssv1, "qcom,kpss-acc-v1", &qcom_smp_kpssv1_ops);
-diff --git a/arch/arm/mach-qcom/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h
-index 7be32ff..6aabb24 100644
 --- a/arch/arm/mach-qcom/scm-boot.h
 +++ b/arch/arm/mach-qcom/scm-boot.h
 @@ -13,9 +13,11 @@
@@ -176,6 +172,3 @@ index 7be32ff..6aabb24 100644
  
  int scm_set_boot_addr(phys_addr_t addr, int flags);
  
--- 
-1.7.10.4
-