compat: fix compile breakage on s390
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 27 Feb 2012 09:01:52 +0000 (10:01 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 15:54:27 +0000 (07:54 -0800)
commit048cd4e51d24ebf7f3552226d03c769d6ad91658
tree286c958b37b8934f1df0120c746a18d98d2ae009
parent500dd2370e77c9551ba298bdeeb91b02d8402199
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>
13 files changed:
arch/s390/include/asm/compat.h
arch/s390/kernel/process.c
arch/s390/kernel/ptrace.c
arch/s390/kernel/setup.c
arch/s390/kernel/signal.c
arch/s390/mm/fault.c
arch/s390/mm/mmap.c
drivers/s390/block/dasd_eckd.c
drivers/s390/block/dasd_ioctl.c
drivers/s390/char/fs3270.c
drivers/s390/char/vmcp.c
drivers/s390/cio/chsc_sch.c
drivers/s390/scsi/zfcp_cfdc.c