diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-11 17:13:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-11 17:13:03 -0800 |
| commit | a638349bf6c29433b938141f99225b160551ff48 (patch) | |
| tree | a13873b0dd2b337d41afd8443d0ec0b0dc186c8a /mm | |
| parent | 085bec853afdbf3edf1b554defaac606a7e3f0c2 (diff) | |
| parent | abee210500ed15a22787009d9210b9a34911afcc (diff) | |
| download | linux-a638349bf6c29433b938141f99225b160551ff48.tar.bz2 | |
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
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/percpu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 79e3549cab0f..50e7fdf84055 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -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 */ |