diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-02-27 10:01:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-04 09:49:22 -0800 |
| commit | 7fce3f2db5913f1fe1fbd4fddd4d3af274098006 (patch) | |
| tree | 659cb65f65779fb5e34a4533792a2c8eb840104f /arch/s390/kernel/ptrace.c | |
| parent | 25d10dda10aa6684c0a48c93a97a85181d53add9 (diff) | |
| download | lwn-7fce3f2db5913f1fe1fbd4fddd4d3af274098006.tar.gz lwn-7fce3f2db5913f1fe1fbd4fddd4d3af274098006.zip | |
compat: fix compile breakage on s390
commit 048cd4e51d24ebf7f3552226d03c769d6ad91658 upstream.
The new is_compat_task() define for the !COMPAT case in
include/linux/compat.h conflicts with a similar define in
arch/s390/include/asm/compat.h.
This is the minimal patch which fixes the build issues.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/kernel/ptrace.c')
| -rw-r--r-- | arch/s390/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 08f883842e21..170e7af73555 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c @@ -36,8 +36,8 @@ #include <linux/regset.h> #include <linux/tracehook.h> #include <linux/seccomp.h> +#include <linux/compat.h> #include <trace/syscall.h> -#include <asm/compat.h> #include <asm/segment.h> #include <asm/page.h> #include <asm/pgtable.h> |