PM / hibernate: Use CONFIG_HAVE_SET_MEMORY for include condition (49368a47) · Commits · 戴 / test

Kbuild reported a build failure when CONFIG_STRICT_KERNEL_RWX was enabled on powerpc. We don't yet have ARCH_HAS_SET_MEMORY and ppc32 saw a build failure. I've only done a basic compile test with a config that has hibernation enabled. Fixes: (kernel/power/snapshot.c: use set_memory.h header) Reported-by:

Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by:

Balbir Singh <bsingharora@gmail.com> Acked-by:

Pavel Machek <pavel@ucw.cz> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

kernel/power/snapshot.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -36,13 +36,13 @@
		#include <asm/pgtable.h>
		#include <asm/tlbflush.h>
		#include <asm/io.h>
		#ifdef CONFIG_STRICT_KERNEL_RWX
		#ifdef CONFIG_ARCH_HAS_SET_MEMORY
		#include <asm/set_memory.h>
		#endif

		#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_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_protect_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 void swsusp_set_page_forbidden(struct page *);

Admin message