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/mm/fault.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/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 354dd39073ef..e8fcd928dc78 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
| 37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
| 38 | #include <asm/mmu_context.h> | 38 | #include <asm/mmu_context.h> |
| 39 | #include <asm/compat.h> | ||
| 40 | #include "../kernel/entry.h" | 39 | #include "../kernel/entry.h" |
| 41 | 40 | ||
| 42 | #ifndef CONFIG_64BIT | 41 | #ifndef CONFIG_64BIT |