aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-03-05 14:06:38 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-19 08:57:58 -0700
commit508e8376b63e20e9191d3b80a3b32a31d0566aee (patch)
tree9141a20b92a982ded1fc360fefec14fc4b378aae /arch
parentaaff6e3506d676b22946677798f16e3bb6e40028 (diff)
downloadkernel_samsung_smdk4412-508e8376b63e20e9191d3b80a3b32a31d0566aee.zip
kernel_samsung_smdk4412-508e8376b63e20e9191d3b80a3b32a31d0566aee.tar.gz
kernel_samsung_smdk4412-508e8376b63e20e9191d3b80a3b32a31d0566aee.tar.bz2
compat: Re-add missing asm/compat.h include to fix compile breakage on s390
For kernels <= 3.0 the backport of 048cd4e51d24ebf7f3552226d03c769d6ad91658 "compat: fix compile breakage on s390" will break compilation... Re-add a single #include <asm/compat.h> in order to fix this. This patch is _not_ necessary for upstream, only for stable kernels which include the "build fix" mentioned above. Reported-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 7547f57..0260051 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -56,6 +56,7 @@
#include <asm/ptrace.h>
#include <asm/sections.h>
#include <asm/ebcdic.h>
+#include <asm/compat.h>
#include <asm/kvm_virtio.h>
long psw_kernel_bits = (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY |