From 3182b97badf48921a108650eb87818fbf6b47e20 Mon Sep 17 00:00:00 2001 From: Stepan Moskovchenko Date: Wed, 3 Jun 2015 14:10:00 -0700 Subject: [PATCH] arm64: Fix conflict resolution in cpuinfo CPU reporting Commit ebc4e05c338bde49382c7c46ce6b8a371713862e ("arm64: show present cpu instead of online cpu in /proc/cpuinfo") did not have its conflicts against msm-3.18 properly resolved. Change-Id: I1f4eb1d8a20b2bc142a7f0b8890d383a9552557c Signed-off-by: Stepan Moskovchenko [satyap: trivial merge conflict resolution and move changes in arch/arm64/kernel from setup.c to cpuinfo.c to align with kernel 4.4] Signed-off-by: Satya Durga Srinivasu Prabhala --- arch/arm64/kernel/cpuinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 0dce71d2fe5b..05015c97a201 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -108,7 +108,7 @@ static int c_show(struct seq_file *m, void *v) { int i, j; - for_each_online_cpu(i) { + for_each_present_cpu(i) { struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i); u32 midr = cpuinfo->reg_midr;