]> git.hungrycats.org Git - linux/commitdiff
compat: Re-add missing asm/compat.h include to fix compile breakage on s390
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 5 Mar 2012 13:06:38 +0000 (14:06 +0100)
committerWilly Tarreau <w@1wt.eu>
Sat, 17 Mar 2012 10:14:46 +0000 (11:14 +0100)
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
arch/s390/kernel/setup.c

index 0b2573aa634a3f0a9b9bee9d279eb09f6567139c..358e545a07589ea5c678f75b5b889a6bbcd7f24e 100644 (file)
@@ -57,6 +57,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 |