Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu fix from Tejun Heo: "Just one patch to work around CRIS boot problem caused by a recent change which freed a temporary boot data structure. The root cause is on CRIS side but it doesn't seem trivial to fix. For now, work around by skipping freeing on CRIS" * 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: hack to let the CRIS architecture to boot until they clean up
This commit is contained in:
commit
a638349bf6
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue