Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

Willy Tarreau
2012-03-15T16:46:27Z

[-- Attachment #1: Type: text/plain, Size: 898 bytes --]

On Thu, Mar 15, 2012 at 08:09:47AM -0700, Greg KH wrote:
> On Thu, Mar 15, 2012 at 11:48:49AM +0100, Jiri Slaby wrote:
> > On 03/12/2012 09:34 PM, Greg KH wrote:
> > > I'm announcing the release of the 3.0.24 kernel.
> > ...
> > > Heiko Carstens (1): compat: fix compile breakage on s390
> >
> > It looks like we need the same fix as for 2.6.32.59:
> > arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
> > arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared
> > (first use in this function)
> > arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is
> > reported only once
> > arch/s390/kernel/setup.c:328: error: for each function it appears in.)
>
> Ick. What is the patch that should be applied here to resolve this? I
> don't remember seeing it go by, but I could have missed it.

Here's the one-liner Heiko sent to me against this issue.

Willy

[-- Attachment #2: 0001-compat-Re-add-missing-asm-compat.h-include-to-fix-co.patch --]
[-- Type: text/plain, Size: 1208 bytes --]

>From 25d31f767ae3a0352b3d553cdea5c38b68bc797c Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 5 Mar 2012 14:06:38 +0100
Subject: compat: Re-add missing asm/compat.h include to fix compile breakage on s390

From: Heiko Carstens <heiko.carstens@de.ibm.com>

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>
---
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 0b2573a..358e545 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -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 |
--
1.7.2.1.45.g54fbc