Skip to content

Commit

Permalink
Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
torvalds committed Dec 12, 2017
2 parents 085bec8 + abee210 commit a638349
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions mm/percpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit a638349

Please sign in to comment.