]> git.karo-electronics.de Git - karo-tx-linux.git/commit
compat: fix compile breakage on s390
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 27 Feb 2012 09:01:52 +0000 (10:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Mar 2012 17:32:38 +0000 (10:32 -0700)
commit9eb9e47632735bb3bb3da343663ea10a6954ef31
tree059d0157a6a5af2dcf766a90ccfa1369b97af7a1
parenta3ea6c14ec93e67c08de43bdf8ce7d701835152f
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>
12 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/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