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 /arch/s390/include | |
| 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 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/compat.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h index da359ca..f7b74bc 100644 --- a/arch/s390/include/asm/compat.h +++ b/arch/s390/include/asm/compat.h @@ -172,13 +172,6 @@ static inline int is_compat_task(void) return is_32bit_task(); } -#else - -static inline int is_compat_task(void) -{ - return 0; -} - #endif static inline void __user *arch_compat_alloc_user_space(long len) |