From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Feb 2017 01:56:45 +0000 (-0800)
Subject: Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v4.11-rc1~126
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bb033829ef3ecfc491c0ed0197966e8f197fbdc;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'rodata-v4.11-rc1' of git://git./linux/kernel/git/kees/linux

Pull rodata updates from Kees Cook:
 "This renames the (now inaccurate) DEBUG_RODATA and related
  SET_MODULE_RONX configs to the more sensible STRICT_KERNEL_RWX and
  STRICT_MODULE_RWX"

* tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX
  arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common
---

7bb033829ef3ecfc491c0ed0197966e8f197fbdc
diff --cc arch/x86/Kconfig.debug
index 783099f,69cdd0b..c4cba00
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -109,17 -109,14 +109,6 @@@ config DEBUG_W
  
  	  If in doubt, say "Y".
  
- config DEBUG_SET_MODULE_RONX
- 	bool "Set loadable kernel module data as NX and text as RO"
- 	depends on MODULES
 -config DEBUG_NX_TEST
 -	tristate "Testcase for the NX non-executable stack feature"
 -	depends on DEBUG_KERNEL && m
--	---help---
- 	  This option helps catch unintended modifications to loadable
- 	  kernel module's text and read-only data. It also prevents execution
- 	  of module data. Such protection may interfere with run-time code
- 	  patching and dynamic kernel tracing - and they might also protect
- 	  against certain classes of kernel exploits.
- 	  If in doubt, say "N".
 -	  This option enables a testcase for the CPU NX capability
 -	  and the software setup of this feature.
 -	  If in doubt, say "N"
--
  config DOUBLEFAULT
  	default y
  	bool "Enable doublefault exception handler" if EXPERT