Merge tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[platform/kernel/linux-rpi.git] / kernel / power / hibernate.c

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 8951d0d..9e1cba0 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1151,7 +1151,7 @@ static int __init hibernate_setup(char *str)
        } else if (!strncmp(str, "no", 2)) {
                noresume = 1;
                nohibernate = 1;
-       } else if (IS_ENABLED(CONFIG_DEBUG_RODATA)
+       } else if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)
                   && !strncmp(str, "protect_image", 13)) {
                enable_restore_image_protection();
        }