diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 07:47:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 07:47:54 -0700 |
| commit | c4301c32663438afb8eac96db01944ad95c00260 (patch) | |
| tree | cc0563cbcdc1c3d136444187211ee13151a28637 /arch/s390/kernel/uprobes.c | |
| parent | c2661b806092d8ea2dccb7b02b65776555e0ee47 (diff) | |
| parent | d6fe5be34cf03e7db36d99c1b9d8e472ad3bdb87 (diff) | |
| download | talos-op-linux-c4301c32663438afb8eac96db01944ad95c00260.tar.gz talos-op-linux-c4301c32663438afb8eac96db01944ad95c00260.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:
"One patch to enable the BPF system call and three more bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/uprobes: fix kprobes dependency
s390: wire up bpf syscall
s390/mm: fixing calls of pte_unmap_unlock
s390/hmcdrv: Restrict s390 HMC driver to S390 arch
Diffstat (limited to 'arch/s390/kernel/uprobes.c')
| -rw-r--r-- | arch/s390/kernel/uprobes.c | 2 |
1 files changed, 1 insertions, 1 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 @@ * 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" |
