evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64: Fix conflict resolution in cpuinfo CPU reporting

Browse source 
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 <stepanm@codeaurora.org>
[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 <satyap@codeaurora.org>
This commit is contained in:
Stepan Moskovchenko 2015-06-03 14:10:00 -07:00 • committed by David Keitel
parent e901e28d56
commit 3182b97bad
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/kernel/cpuinfo.c
View file

@ -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;