mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [merged] pm-hibernate-use-set_memoryh-header.patch removed from -mm tree
@ 2017-05-09 18:03 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2017-05-09 18:03 UTC (permalink / raw)
  To: labbott, mm-commits


The patch titled
     Subject: kernel/power/snapshot.c: use set_memory.h header
has been removed from the -mm tree.  Its filename was
     pm-hibernate-use-set_memoryh-header.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Laura Abbott <labbott@redhat.com>
Subject: kernel/power/snapshot.c: use set_memory.h header

set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.

Link: http://lkml.kernel.org/r/1488920133-27229-13-git-send-email-labbott@redhat.com
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/power/snapshot.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN kernel/power/snapshot.c~pm-hibernate-use-set_memoryh-header kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~pm-hibernate-use-set_memoryh-header
+++ a/kernel/power/snapshot.c
@@ -36,6 +36,9 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/io.h>
+#ifdef CONFIG_STRICT_KERNEL_RWX
+#include <asm/set_memory.h>
+#endif
 
 #include "power.h"
 
_

Patches currently in -mm which might be from labbott@redhat.com are



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-05-09 18:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-09 18:03 [merged] pm-hibernate-use-set_memoryh-header.patch removed from -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).