summaryrefslogtreecommitdiffstats
path: root/kernel/power/snapshot.c
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2017-02-06 19:31:58 -0500
committerKees Cook <keescook@chromium.org>2017-02-07 15:32:52 -0500
commit0f5bf6d0afe4be6e1391908ff2d6dc9730e91550 (patch)
tree12c10057175483fe3f3720b37b7ffb5b73241b2a /kernel/power/snapshot.c
parentad21fc4faa2a1f919bac1073b885df9310dbc581 (diff)
arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX
Both of these options are poorly named. The features they provide are necessary for system security and should not be considered debug only. Change the names to CONFIG_STRICT_KERNEL_RWX and CONFIG_STRICT_MODULE_RWX to better describe what these options do. Signed-off-by: Laura Abbott <labbott@redhat.com> Acked-by: Jessica Yu <jeyu@redhat.com> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'kernel/power/snapshot.c')
-rw-r--r--kernel/power/snapshot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 2d8e2b227db8..905d5bbd595f 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -38,7 +38,7 @@
38 38
39#include "power.h" 39#include "power.h"
40 40
41#ifdef CONFIG_DEBUG_RODATA 41#ifdef CONFIG_STRICT_KERNEL_RWX
42static bool hibernate_restore_protection; 42static bool hibernate_restore_protection;
43static bool hibernate_restore_protection_active; 43static bool hibernate_restore_protection_active;
44 44
@@ -73,7 +73,7 @@ static inline void hibernate_restore_protection_begin(void) {}
73static inline void hibernate_restore_protection_end(void) {} 73static inline void hibernate_restore_protection_end(void) {}
74static inline void hibernate_restore_protect_page(void *page_address) {} 74static inline void hibernate_restore_protect_page(void *page_address) {}
75static inline void hibernate_restore_unprotect_page(void *page_address) {} 75static inline void hibernate_restore_unprotect_page(void *page_address) {}
76#endif /* CONFIG_DEBUG_RODATA */ 76#endif /* CONFIG_STRICT_KERNEL_RWX */
77 77
78static int swsusp_page_is_free(struct page *); 78static int swsusp_page_is_free(struct page *);
79static void swsusp_set_page_forbidden(struct page *); 79static void swsusp_set_page_forbidden(struct page *);