Commit 8138c710 authored Jun 03, 2015 by Stepan Moskovchenko

arm64: Fix conflict resolution in cpuinfo CPU reporting



Commit ebc4e05c ("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>

parent d3bd0080

arch/arm64/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -504,7 +504,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;
		/*