| Message ID | 20170603105232.6436-1-bsingharora@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
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>
On Sat, Jun 3, 2017 at 11:27 PM, Pavel Machek <pavel@ucw.cz> wrote: > 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> Ping. Could we please pick this up? it breaks any attempt to support STRICT_KERNEL_RWX on powerpc Balbir Singh.
On Monday, June 26, 2017 01:34:52 PM Balbir Singh wrote: > On Sat, Jun 3, 2017 at 11:27 PM, Pavel Machek <pavel@ucw.cz> wrote: > > 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> > > Ping. Could we please pick this up? it breaks any attempt to support > STRICT_KERNEL_RWX on powerpc Yes, I'm going to pick it up for 4.13. Thanks, Rafael
On Tue, Jun 27, 2017 at 7:07 AM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > On Monday, June 26, 2017 01:34:52 PM Balbir Singh wrote: >> On Sat, Jun 3, 2017 at 11:27 PM, Pavel Machek <pavel@ucw.cz> wrote: >> > 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> >> >> Ping. Could we please pick this up? it breaks any attempt to support >> STRICT_KERNEL_RWX on powerpc > > Yes, I'm going to pick it up for 4.13. Thanks, Balbir Singh.
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 *);
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(-)