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


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

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

------------------------------------------------------
From: Michael Ellerman <mpe@ellerman.id.au>
Subject: kernel/power/snapshot.c: use linux/set_memory.h

This header always exists, so doesn't require an ifdef around its
inclusion.  When CONFIG_ARCH_HAS_SET_MEMORY=y it includes the asm header,
otherwise it provides empty versions of the set_memory_xx() routines.

Link: http://lkml.kernel.org/r/1498717781-29151-2-git-send-email-mpe@ellerman.id.au
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Laura Abbott <labbott@redhat.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/power/snapshot.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff -puN kernel/power/snapshot.c~pm-hibernate-use-linux-set_memoryh kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~pm-hibernate-use-linux-set_memoryh
+++ a/kernel/power/snapshot.c
@@ -30,15 +30,13 @@
 #include <linux/slab.h>
 #include <linux/compiler.h>
 #include <linux/ktime.h>
+#include <linux/set_memory.h>
 
 #include <linux/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/io.h>
-#ifdef CONFIG_ARCH_HAS_SET_MEMORY
-#include <asm/set_memory.h>
-#endif
 
 #include "power.h"
 
_

Patches currently in -mm which might be from mpe@ellerman.id.au are



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

only message in thread, other threads:[~2017-07-07 19:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-07 19:07 [merged] pm-hibernate-use-linux-set_memoryh.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).