|
@@ -36,13 +36,13 @@
|
|
#include <asm/pgtable.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/tlbflush.h>
|
|
#include <asm/tlbflush.h>
|
|
#include <asm/io.h>
|
|
#include <asm/io.h>
|
|
-#ifdef CONFIG_STRICT_KERNEL_RWX
|
|
|
|
|
|
+#ifdef CONFIG_ARCH_HAS_SET_MEMORY
|
|
#include <asm/set_memory.h>
|
|
#include <asm/set_memory.h>
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#include "power.h"
|
|
#include "power.h"
|
|
|
|
|
|
-#ifdef CONFIG_STRICT_KERNEL_RWX
|
|
|
|
|
|
+#if defined(CONFIG_STRICT_KERNEL_RWX) && defined(CONFIG_ARCH_HAS_SET_MEMORY)
|
|
static bool hibernate_restore_protection;
|
|
static bool hibernate_restore_protection;
|
|
static bool hibernate_restore_protection_active;
|
|
static bool hibernate_restore_protection_active;
|
|
|
|
|
|
@@ -77,7 +77,7 @@ static inline void hibernate_restore_protection_begin(void) {}
|
|
static inline void hibernate_restore_protection_end(void) {}
|
|
static inline void hibernate_restore_protection_end(void) {}
|
|
static inline void hibernate_restore_protect_page(void *page_address) {}
|
|
static inline void hibernate_restore_protect_page(void *page_address) {}
|
|
static inline void hibernate_restore_unprotect_page(void *page_address) {}
|
|
static inline void hibernate_restore_unprotect_page(void *page_address) {}
|
|
-#endif /* CONFIG_STRICT_KERNEL_RWX */
|
|
|
|
|
|
+#endif /* CONFIG_STRICT_KERNEL_RWX && CONFIG_ARCH_HAS_SET_MEMORY */
|
|
|
|
|
|
static int swsusp_page_is_free(struct page *);
|
|
static int swsusp_page_is_free(struct page *);
|
|
static void swsusp_set_page_forbidden(struct page *);
|
|
static void swsusp_set_page_forbidden(struct page *);
|