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-12 10:32:38 -0700 |
| commit | 9eb9e47632735bb3bb3da343663ea10a6954ef31 (patch) | |
| tree | 059d0157a6a5af2dcf766a90ccfa1369b97af7a1 /drivers/s390/char | |
| parent | a3ea6c14ec93e67c08de43bdf8ce7d701835152f (diff) | |
| download | kernel_samsung_smdk4412-9eb9e47632735bb3bb3da343663ea10a6954ef31.zip kernel_samsung_smdk4412-9eb9e47632735bb3bb3da343663ea10a6954ef31.tar.gz kernel_samsung_smdk4412-9eb9e47632735bb3bb3da343663ea10a6954ef31.tar.bz2 | |
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 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/fs3270.c | 2 | ||||
| -rw-r--r-- | drivers/s390/char/vmcp.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index f6489eb..e197fd7 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c @@ -14,8 +14,8 @@ #include <linux/list.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/compat.h> -#include <asm/compat.h> #include <asm/ccwdev.h> #include <asm/cio.h> #include <asm/ebcdic.h> diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c index 31a3ccb..84e569c 100644 --- a/drivers/s390/char/vmcp.c +++ b/drivers/s390/char/vmcp.c @@ -13,6 +13,7 @@ #include <linux/fs.h> #include <linux/init.h> +#include <linux/compat.h> #include <linux/kernel.h> #include <linux/miscdevice.h> #include <linux/slab.h> |