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

Commit abee2105 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Tejun Heo
Browse files

percpu: hack to let the CRIS architecture to boot until they clean up



Commit 438a5061 ("percpu: don't forget to free the temporary struct
pcpu_alloc_info") uncovered a problem on the CRIS architecture where
the bootmem allocator is initialized with virtual addresses. Given it
has:

    #define __va(x) ((void *)((unsigned long)(x) | 0x80000000))

then things just work out because the end result is the same whether you
give this a physical or a virtual address.

Untill you call memblock_free_early(__pa(address)) that is, because
values from __pa() don't match with the virtual addresses stuffed in the
bootmem allocator anymore.

Avoid freeing the temporary pcpu_alloc_info memory on that architecture
until they fix things up to let the kernel boot like it did before.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Fixes: 438a5061 ("percpu: don't forget to free the temporary struct pcpu_alloc_info")
parent 4fbd8d19
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -2719,7 +2719,11 @@ void __init setup_per_cpu_areas(void)

	if (pcpu_setup_first_chunk(ai, fc) < 0)
		panic("Failed to initialize percpu areas.");
#ifdef CONFIG_CRIS
#warning "the CRIS architecture has physical and virtual addresses confused"
#else
	pcpu_free_alloc_info(ai);
#endif
}

#endif	/* CONFIG_SMP */