diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-02-27 04:01:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-27 10:54:27 -0500 |
| commit | 048cd4e51d24ebf7f3552226d03c769d6ad91658 (patch) | |
| tree | 286c958b37b8934f1df0120c746a18d98d2ae009 /arch/s390/kernel/ptrace.c | |
| parent | 500dd2370e77c9551ba298bdeeb91b02d8402199 (diff) | |
compat: fix compile breakage on s390
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>
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 9d82ed4bcb27..61f95489d70c 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <linux/regset.h> | 20 | #include <linux/regset.h> |
| 21 | #include <linux/tracehook.h> | 21 | #include <linux/tracehook.h> |
| 22 | #include <linux/seccomp.h> | 22 | #include <linux/seccomp.h> |
| 23 | #include <linux/compat.h> | ||
| 23 | #include <trace/syscall.h> | 24 | #include <trace/syscall.h> |
| 24 | #include <asm/compat.h> | ||
| 25 | #include <asm/segment.h> | 25 | #include <asm/segment.h> |
| 26 | #include <asm/page.h> | 26 | #include <asm/page.h> |
| 27 | #include <asm/pgtable.h> | 27 | #include <asm/pgtable.h> |