projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.14 to 3.14.18
[openwrt/staging/wigyori.git]
/
target
/
linux
/
ipq806x
/
patches
/
0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch
diff --git
a/target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch
b/target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch
index 6601ad4e0daff1deccc6c26c4932dda29b5c3fd3..4bab4c962bbc25a3f8ec22c339452f075049308f 100644
(file)
--- a/
target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch
+++ b/
target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch
@@
-22,8
+22,6
@@
Signed-off-by: Kumar Gala <galak@codeaurora.org>
arch/arm/mach-qcom/platsmp.c | 118 +++++++++++++++++++++++-------------------
3 files changed, 65 insertions(+), 69 deletions(-)
arch/arm/mach-qcom/platsmp.c | 118 +++++++++++++++++++++++-------------------
3 files changed, 65 insertions(+), 69 deletions(-)
-diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
-index 0a4899b..572479a 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -23,8 +23,6 @@ extern void msm_map_qsd8x50_io(void);
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -23,8 +23,6 @@ extern void msm_map_qsd8x50_io(void);
@@
-35,8
+33,6
@@
index 0a4899b..572479a 100644
struct msm_mmc_platform_data;
extern void msm_add_devices(void);
struct msm_mmc_platform_data;
extern void msm_add_devices(void);
-diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
-index 830f69c..bae617e 100644
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -11,30 +11,16 @@
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -11,30 +11,16 @@
@@
-70,8
+66,6
@@
index 830f69c..bae617e 100644
-DT_MACHINE_START(APQ_DT, "Qualcomm (Flattened Device Tree)")
- .dt_compat = apq8074_dt_match,
-MACHINE_END
-DT_MACHINE_START(APQ_DT, "Qualcomm (Flattened Device Tree)")
- .dt_compat = apq8074_dt_match,
-MACHINE_END
-diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
-index 9c53ea7..ec8604d 100644
--- a/arch/arm/mach-qcom/platsmp.c
+++ b/arch/arm/mach-qcom/platsmp.c
@@ -13,17 +13,18 @@
--- a/arch/arm/mach-qcom/platsmp.c
+++ b/arch/arm/mach-qcom/platsmp.c
@@ -13,17 +13,18 @@
@@
-97,7
+91,7
@@
index 9c53ea7..ec8604d 100644
extern void secondary_startup(void);
extern void secondary_startup(void);
-@@ -36,12 +37,6 @@ static void __ref qcom_cpu_die(unsigned
int cpu)
+@@ -36,12 +37,6 @@ static void __ref qcom_cpu_die(unsigned
}
#endif
}
#endif
@@
-110,7
+104,7
@@
index 9c53ea7..ec8604d 100644
static void qcom_secondary_init(unsigned int cpu)
{
/*
static void qcom_secondary_init(unsigned int cpu)
{
/*
-@@ -51,33 +46,41 @@ static void qcom_secondary_init(unsigned
int cpu)
+@@ -51,33 +46,41 @@ static void qcom_secondary_init(unsigned
spin_unlock(&boot_lock);
}
spin_unlock(&boot_lock);
}
@@
-174,7
+168,7
@@
index 9c53ea7..ec8604d 100644
}
/*
}
/*
-@@ -99,39 +102,48 @@ static int qcom_boot_secondary(unsigned
int cpu, struct task_struct *idle)
+@@ -99,39 +102,48 @@ static int qcom_boot_secondary(unsigned
*/
spin_unlock(&boot_lock);
*/
spin_unlock(&boot_lock);
@@
-189,8
+183,7
@@
index 9c53ea7..ec8604d 100644
- * NR_CPUS.
- */
-static void __init qcom_smp_init_cpus(void)
- * NR_CPUS.
- */
-static void __init qcom_smp_init_cpus(void)
-+static int msm8660_boot_secondary(unsigned int cpu, struct task_struct *idle)
- {
+-{
- unsigned int i, ncores = get_core_count();
-
- if (ncores > nr_cpu_ids) {
- unsigned int i, ncores = get_core_count();
-
- if (ncores > nr_cpu_ids) {
@@
-201,6
+194,8
@@
index 9c53ea7..ec8604d 100644
-
- for (i = 0; i < ncores; i++)
- set_cpu_possible(i, true);
-
- for (i = 0; i < ncores; i++)
- set_cpu_possible(i, true);
++static int msm8660_boot_secondary(unsigned int cpu, struct task_struct *idle)
++{
+ return qcom_boot_secondary(cpu, scss_release_secondary);
}
+ return qcom_boot_secondary(cpu, scss_release_secondary);
}
@@
-244,6
+239,3
@@
index 9c53ea7..ec8604d 100644
#endif
};
+CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops);
#endif
};
+CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops);
---
-1.7.10.4
-