diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-24 16:40:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-24 16:40:26 +1100 |
| commit | 1331845e45f1524a8789d4b03a9636f81aff3f33 (patch) | |
| tree | 7d0c87d57daabcb72ad5a5b7de69d6236c8f15e2 /arch/s390/kernel/kprobes.c | |
| parent | cb051c970960402ddb2df556911e323a215922ca (diff) | |
| parent | ff4eb5d0c322d4e5e92917557e3b954431dd1aec (diff) | |
| download | linux-1331845e45f1524a8789d4b03a9636f81aff3f33.tar.gz linux-1331845e45f1524a8789d4b03a9636f81aff3f33.tar.xz | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/s390/kernel/kprobes.c')
| -rw-r--r-- | arch/s390/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 76f9eda1d7c0..3d6a99746454 100644 --- a/arch/s390/kernel/kprobes.c +++ b/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> |