Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75bda950 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: Don't print cpu_spec->cpu_name if it's NULL 



Currently we assume that if the cpu_spec has a pvr_mask then it must also have a
cpu_name. But that will change in a subsequent commit when we do CPU feature
discovery via the device tree, so check explicitly if cpu_name is NULL.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ea47dd19

arch/powerpc/kernel/setup-common.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	seq_printf(m, "processor\t: %lu\n", cpu_id);

	seq_printf(m, "cpu\t\t: ");



	if (cur_cpu_spec->pvr_mask)

	if (cur_cpu_spec->pvr_mask && cur_cpu_spec->cpu_name)

		seq_printf(m, "%s", cur_cpu_spec->cpu_name);

	else

		seq_printf(m, "unknown (%08x)", pvr);