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

Commit d0055797 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

MIPS: fix Select HAVE_IRQ_EXIT_ON_IRQ_STACK patch. 



Commit f017e58d which was commit
3cc3434fd6307d06b53b98ce83e76bf9807689b9 upstream, was misapplied to the
4.4 stable kernel.

This patch fixes this and moves the chunk to the proper Kconfig area.

Reported-by: default avatar"Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Jason A. Donenfeld <jason@zx2c4.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e2f5fb92

arch/mips/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ config CPU_MIPS32_R6 
	select CPU_SUPPORTS_MSA

	select GENERIC_CSUM

	select HAVE_KVM

	select MIPS_O32_FP64_SUPPORT if 32BIT

	select MIPS_O32_FP64_SUPPORT

	help

	  Choose this option to build a kernel for release 6 or later of the

	  MIPS32 architecture.  New MIPS processors, starting with the Warrior
@@ -1464,7 +1464,7 @@ config CPU_MIPS64_R6 
	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select GENERIC_CSUM

	select MIPS_O32_FP64_SUPPORT if MIPS32_O32

	select MIPS_O32_FP64_SUPPORT if 32BIT || MIPS32_O32

	help

	  Choose this option to build a kernel for release 6 or later of the

	  MIPS64 architecture.  New MIPS processors, starting with the Warrior