+ s390-use-set_memoryh-header.patch added to -mm tree

* + s390-use-set_memoryh-header.patch added to -mm tree
@ 2017-03-09 21:38 akpm
  0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2017-03-09 21:38 UTC (permalink / raw)
  To: labbott, heiko.carstens, mm-commits


The patch titled
     Subject: s390: use set_memory.h header
has been added to the -mm tree.  Its filename is
     s390-use-set_memoryh-header.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/s390-use-set_memoryh-header.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/s390-use-set_memoryh-header.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Laura Abbott <labbott@redhat.com>
Subject: s390: 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-5-git-send-email-labbott@redhat.com
Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/s390/kernel/ftrace.c        |    1 +
 arch/s390/kernel/kprobes.c       |    2 +-
 arch/s390/kernel/machine_kexec.c |    1 +
 arch/s390/mm/init.c              |    1 +
 arch/s390/mm/pageattr.c          |    1 +
 arch/s390/mm/vmem.c              |    1 +
 arch/s390/net/bpf_jit_comp.c     |    1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff -puN arch/s390/kernel/ftrace.c~s390-use-set_memoryh-header arch/s390/kernel/ftrace.c

--- a/arch/s390/kernel/ftrace.c~s390-use-set_memoryh-header
+++ a/arch/s390/kernel/ftrace.c
@@ -17,6 +17,7 @@
 #include <trace/syscall.h>
 #include <asm/asm-offsets.h>
 #include <asm/cacheflush.h>
+#include <asm/set_memory.h>
 #include "entry.h"
 
 /*
diff -puN arch/s390/kernel/kprobes.c~s390-use-set_memoryh-header arch/s390/kernel/kprobes.c
--- a/arch/s390/kernel/kprobes.c~s390-use-set_memoryh-header
+++ a/arch/s390/kernel/kprobes.c
@@ -31,7 +31,7 @@
 #include <linux/slab.h>
 #include <linux/hardirq.h>
 #include <linux/ftrace.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
 #include <asm/sections.h>
 #include <linux/uaccess.h>
 #include <asm/dis.h>
diff -puN arch/s390/kernel/machine_kexec.c~s390-use-set_memoryh-header arch/s390/kernel/machine_kexec.c
--- a/arch/s390/kernel/machine_kexec.c~s390-use-set_memoryh-header
+++ a/arch/s390/kernel/machine_kexec.c
@@ -26,6 +26,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/cacheflush.h>
 #include <asm/os_info.h>
+#include <asm/set_memory.h>
 #include <asm/switch_to.h>
 
 typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long);
diff -puN arch/s390/mm/init.c~s390-use-set_memoryh-header arch/s390/mm/init.c
--- a/arch/s390/mm/init.c~s390-use-set_memoryh-header
+++ a/arch/s390/mm/init.c
@@ -39,6 +39,7 @@
 #include <asm/sections.h>
 #include <asm/ctl_reg.h>
 #include <asm/sclp.h>
+#include <asm/set_memory.h>
 
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
 
diff -puN arch/s390/mm/pageattr.c~s390-use-set_memoryh-header arch/s390/mm/pageattr.c
--- a/arch/s390/mm/pageattr.c~s390-use-set_memoryh-header
+++ a/arch/s390/mm/pageattr.c
@@ -8,6 +8,7 @@
 #include <asm/facility.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
+#include <asm/set_memory.h>
 
 static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)
 {
diff -puN arch/s390/mm/vmem.c~s390-use-set_memoryh-header arch/s390/mm/vmem.c
--- a/arch/s390/mm/vmem.c~s390-use-set_memoryh-header
+++ a/arch/s390/mm/vmem.c
@@ -17,6 +17,7 @@
 #include <asm/setup.h>
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
+#include <asm/set_memory.h>
 
 static DEFINE_MUTEX(vmem_mutex);
 
diff -puN arch/s390/net/bpf_jit_comp.c~s390-use-set_memoryh-header arch/s390/net/bpf_jit_comp.c
--- a/arch/s390/net/bpf_jit_comp.c~s390-use-set_memoryh-header
+++ a/arch/s390/net/bpf_jit_comp.c
@@ -24,6 +24,7 @@
 #include <linux/bpf.h>
 #include <asm/cacheflush.h>
 #include <asm/dis.h>
+#include <asm/set_memory.h>
 #include "bpf_jit.h"
 
 int bpf_jit_enable __read_mostly;
_

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

treewide-move-set_memory_-functions-away-from-cacheflushh.patch
arm-use-set_memoryh-header.patch
arm64-use-set_memoryh-header.patch
s390-use-set_memoryh-header.patch
x86-use-set_memoryh-header.patch
agp-use-set_memoryh-header.patch
drm-use-set_memoryh-header.patch
intel_th-use-set_memoryh-header.patch
watchdog-hpwdt-use-set_memoryh-header.patch
bpf-use-set_memoryh-header.patch
module-use-set_memoryh-header.patch
pm-hibernate-use-set_memoryh-header.patch
alsa-use-set_memoryh-header.patch
misc-sram-use-set_memoryh-header.patch
video-vermilion-use-set_memoryh-header.patch
treewide-decouple-cacheflushh-and-set_memoryh.patch


^ permalink raw reply	[flat|nested] 2+ messages in thread