summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorJan Willeke <willeke@de.ibm.com>2014-10-08 08:16:08 (GMT)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-10-17 12:45:51 (GMT)
commitd6fe5be34cf03e7db36d99c1b9d8e472ad3bdb87 (patch)
treebdbbcfd4354a161acde1ae16e8790de800b9c30f /arch/s390
parentfcb1c2d75b55fe52c40cd9692fda73da061f19aa (diff)
downloadlinux-d6fe5be34cf03e7db36d99c1b9d8e472ad3bdb87.tar.xz
s390/uprobes: fix kprobes dependency
If kprobes is disabled uprobes will not compile. Fix this by including the correct header files. Signed-off-by: Jan Willeke <willeke@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/uprobes.c2
-rw-r--r--arch/s390/lib/probes.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/uprobes.c b/arch/s390/kernel/uprobes.c
index 956f4f7..f6b3cd0 100644
--- a/arch/s390/kernel/uprobes.c
+++ b/arch/s390/kernel/uprobes.c
@@ -5,13 +5,13 @@
* Author(s): Jan Willeke,
*/
-#include <linux/kprobes.h>
#include <linux/uaccess.h>
#include <linux/uprobes.h>
#include <linux/compat.h>
#include <linux/kdebug.h>
#include <asm/switch_to.h>
#include <asm/facility.h>
+#include <asm/kprobes.h>
#include <asm/dis.h>
#include "entry.h"
diff --git a/arch/s390/lib/probes.c b/arch/s390/lib/probes.c
index c5d64a0..ae90e1a 100644
--- a/arch/s390/lib/probes.c
+++ b/arch/s390/lib/probes.c
@@ -4,7 +4,7 @@
* Copyright IBM Corp. 2014
*/
-#include <linux/kprobes.h>
+#include <asm/kprobes.h>
#include <asm/dis.h>
int probe_is_prohibited_opcode(u16 *insn)