Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1656779 > unrolled thread

[PATCH] kernel/power/suspend: use CONFIG_HAVE_SET_MEMORY for include condition

Back to article view | Back to linux.kernel

Contents

  [PATCH] kernel/power/suspend: use CONFIG_HAVE_SET_MEMORY for include condition Balbir Singh <bsingharora@gmail.com> - 2017-06-03 13:00 +0200
    Re: [PATCH] kernel/power/suspend: use CONFIG_HAVE_SET_MEMORY for  include condition Pavel Machek <pavel@ucw.cz> - 2017-06-03 15:30 +0200

#1656779 — [PATCH] kernel/power/suspend: use CONFIG_HAVE_SET_MEMORY for include condition

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.

fixes(50327dd kernel/power/snapshot.c: use set_memory.h header)

I've only done a basic compile test with a config that has
hibernation enabled.

Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>

Reported-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
 kernel/power/snapshot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index fa46606..71730d6 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -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 *);
-- 
2.9.3

[toc] | [next] | [standalone]

#1656800 — Re: [PATCH] kernel/power/suspend: use CONFIG_HAVE_SET_MEMORY for include condition

[Multipart message — attachments visible in raw view] — view raw

On Sat 2017-06-03 20:52:32, Balbir Singh wrote:
> 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.
> 
> fixes(50327dd kernel/power/snapshot.c: use set_memory.h header)
> 
> I've only done a basic compile test with a config that has
> hibernation enabled.
> 
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Len Brown <len.brown@intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web