diff options
author | Jan Willeke <willeke@de.ibm.com> | 2014-10-08 04:16:08 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-10-17 08:45:51 -0400 |
commit | d6fe5be34cf03e7db36d99c1b9d8e472ad3bdb87 (patch) | |
tree | bdbbcfd4354a161acde1ae16e8790de800b9c30f | |
parent | fcb1c2d75b55fe52c40cd9692fda73da061f19aa (diff) |
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>
-rw-r--r-- | arch/s390/kernel/uprobes.c | 2 | ||||
-rw-r--r-- | arch/s390/lib/probes.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/uprobes.c b/arch/s390/kernel/uprobes.c index 956f4f7a591c..f6b3cd056ec2 100644 --- a/arch/s390/kernel/uprobes.c +++ b/arch/s390/kernel/uprobes.c | |||
@@ -5,13 +5,13 @@ | |||
5 | * Author(s): Jan Willeke, | 5 | * Author(s): Jan Willeke, |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/kprobes.h> | ||
9 | #include <linux/uaccess.h> | 8 | #include <linux/uaccess.h> |
10 | #include <linux/uprobes.h> | 9 | #include <linux/uprobes.h> |
11 | #include <linux/compat.h> | 10 | #include <linux/compat.h> |
12 | #include <linux/kdebug.h> | 11 | #include <linux/kdebug.h> |
13 | #include <asm/switch_to.h> | 12 | #include <asm/switch_to.h> |
14 | #include <asm/facility.h> | 13 | #include <asm/facility.h> |
14 | #include <asm/kprobes.h> | ||
15 | #include <asm/dis.h> | 15 | #include <asm/dis.h> |
16 | #include "entry.h" | 16 | #include "entry.h" |
17 | 17 | ||
diff --git a/arch/s390/lib/probes.c b/arch/s390/lib/probes.c index c5d64a099719..ae90e1ae3607 100644 --- a/arch/s390/lib/probes.c +++ b/arch/s390/lib/probes.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Copyright IBM Corp. 2014 | 4 | * Copyright IBM Corp. 2014 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/kprobes.h> | 7 | #include <asm/kprobes.h> |
8 | #include <asm/dis.h> | 8 | #include <asm/dis.h> |
9 | 9 | ||
10 | int probe_is_prohibited_opcode(u16 *insn) | 10 | int probe_is_prohibited_opcode(u16 *insn) |