powerpc: Pass the right cpu_spec to ->setup_cpu() on 64-bit
PATCH 1/1 powerpc: Pass the right cpu_spec to ->setup_cpu() on 64-bit
When calling setup_cpu() on 64-bit, we pass a pointer to the cputable entry we have found. This used to be fine when cur_cpu_spec was a pointer to that entry, but nowadays, we copy the entry into a separate variable, and we do so before we call the setup_cpu() callback. That means that any attempt by that callback at patching the CPU table entry (to adjust CPU features for example) will patch the wrong table.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
--- arch/powerpc/kernel/cputable.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/cputable.c +2 -2
@@ -2105,8 +2105,8 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)* pointer on ppc64 and booke as we are running at 0 in real mode * on ppc64 and reloc_offset is always 0 on booke. */ -if (s->cpu_setup) { - s->cpu_setup (offset, s); +if (t->cpu_setup) { + t->cpu_setup (offset, t); }#endif /* CONFIG_PPC64 || CONFIG_BOOKE */ }