diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-03-05 08:06:38 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2012-03-26 05:27:05 -0400 |
| commit | b7c01f3c81fb279d0cebece7e233533137651c13 (patch) | |
| tree | eb3a283bd44829abf68df6764ea3c2b9328e4526 /arch/s390 | |
| parent | 96a5b7e69cec67d9a530d24568e9d559ffd0ce87 (diff) | |
compat: Re-add missing asm/compat.h include to fix compile breakage on s390
BugLink: http://bugs.launchpad.net/bugs/959470
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: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 7547f57e291..0260051c08f 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | #include <asm/ptrace.h> | 56 | #include <asm/ptrace.h> |
| 57 | #include <asm/sections.h> | 57 | #include <asm/sections.h> |
| 58 | #include <asm/ebcdic.h> | 58 | #include <asm/ebcdic.h> |
| 59 | #include <asm/compat.h> | ||
| 59 | #include <asm/kvm_virtio.h> | 60 | #include <asm/kvm_virtio.h> |
| 60 | 61 | ||
| 61 | long psw_kernel_bits = (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY | | 62 | long psw_kernel_bits = (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY | |