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

Commit e4178c75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa

Pull Xtensa fix from Max Filippov:
 "A for an Xtensa build error introduced in reset code refactoring
  series in v4.9:

   - fix noMMU build on cores with MMU"

* tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: fix noMMU build on cores with MMU
parents f2557779 4b3e6f2e
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -419,7 +419,7 @@ subsys_initcall(topology_init);


void cpu_reset(void)
void cpu_reset(void)
{
{
#if XCHAL_HAVE_PTP_MMU
#if XCHAL_HAVE_PTP_MMU && IS_ENABLED(CONFIG_MMU)
	local_irq_disable();
	local_irq_disable();
	/*
	/*
	 * We have full MMU: all autoload ways, ways 7, 8 and 9 of DTLB must
	 * We have full MMU: all autoload ways, ways 7, 8 and 9 of DTLB must