kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / ipq806x / patches / 0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch

diff --git a/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch b/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch
index fc064b27a9f36b7e40b61199bd1a4833dabca020..cab5bcd203786db272264fca8d2015d215c59161 100644 (file)
--- a/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch
+++ b/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch
@@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org>
  arch/arm/mach-qcom/platsmp.c |   22 +++++++++++-----------
  2 files changed, 13 insertions(+), 13 deletions(-)
 
-diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
-index 4529f6b..830f69c 100644
 --- a/arch/arm/mach-qcom/board.c
 +++ b/arch/arm/mach-qcom/board.c
 @@ -17,7 +17,7 @@
@@ -27,7 +25,7 @@ index 4529f6b..830f69c 100644
  
  static const char * const qcom_dt_match[] __initconst = {
        "qcom,msm8660-surf",
-@@ -31,7 +31,7 @@ static const char * const apq8074_dt_match[] __initconst = {
+@@ -31,7 +31,7 @@ static const char * const apq8074_dt_mat
  };
  
  DT_MACHINE_START(QCOM_DT, "Qualcomm (Flattened Device Tree)")
@@ -36,8 +34,6 @@ index 4529f6b..830f69c 100644
        .dt_compat = qcom_dt_match,
  MACHINE_END
  
-diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
-index 67823a7..9c53ea7 100644
 --- a/arch/arm/mach-qcom/platsmp.c
 +++ b/arch/arm/mach-qcom/platsmp.c
 @@ -30,7 +30,7 @@ extern void secondary_startup(void);
@@ -58,7 +54,7 @@ index 67823a7..9c53ea7 100644
  {
        /*
         * Synchronise with the boot thread.
-@@ -70,7 +70,7 @@ static void prepare_cold_cpu(unsigned int cpu)
+@@ -70,7 +70,7 @@ static void prepare_cold_cpu(unsigned in
                                  "address\n");
  }
  
@@ -67,7 +63,7 @@ index 67823a7..9c53ea7 100644
  {
        static int cold_boot_done;
  
-@@ -108,7 +108,7 @@ static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -108,7 +108,7 @@ static int msm_boot_secondary(unsigned i
   * does not support the ARM SCU, so just set the possible cpu mask to
   * NR_CPUS.
   */
@@ -76,7 +72,7 @@ index 67823a7..9c53ea7 100644
  {
        unsigned int i, ncores = get_core_count();
  
-@@ -122,16 +122,16 @@ static void __init msm_smp_init_cpus(void)
+@@ -122,16 +122,16 @@ static void __init msm_smp_init_cpus(voi
                set_cpu_possible(i, true);
  }
  
@@ -100,6 +96,3 @@ index 67823a7..9c53ea7 100644
 +      .cpu_die                = qcom_cpu_die,
  #endif
  };
--- 
-1.7.10.4
-