linux-kernel - Re: Build broken on s390 and ia64 [was: Linux 2.6.32.58]

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120305131323.GB3627@osiris.boeblingen.de.ibm.com>
Date:	Mon, 5 Mar 2012 14:13:23 +0100
From:	Heiko Carstens <heiko.carstens@...ibm.com>
To:	Jiri Slaby <jslaby@...e.cz>
Cc:	Greg KH <gregkh@...uxfoundation.org>, linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>,
	torvalds@...ux-foundation.org, stable@...r.kernel.org, lwn@....net,
	Tony Luck <tony.luck@...el.com>,
	Jiri Slaby <jirislaby@...il.com>, raven@...maw.net
Subject: Re: Build broken on s390 and ia64 [was: Linux 2.6.32.58]

On Mon, Mar 05, 2012 at 01:48:24PM +0100, Jiri Slaby wrote:
> On 03/05/2012 01:02 PM, Heiko Carstens wrote:
> > On Mon, Mar 05, 2012 at 12:32:58PM +0100, Jiri Slaby wrote:
> >> Perhaps asm/compat.h should be included from linux/compat.h
> >> unconditionally...
> > 
> > If you do that you need to add #ifdef wrappers around the is_compat_task()
> > definitions in each arch that supports CONFIG_COMPAT. If that's all that's
> > needed that would be great!
> 
> I don't know, I haven't checked. It was just a shot in the dark. Maybe
> it's easier to revert the removal of asm/compat.h from s390 files. Could
> you bake a patch?

Sure:

>From f88668aaee256a331ea03c852c672d3ef7704208 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@...ibm.com>
Date: Mon, 5 Mar 2012 14:06:38 +0100
Subject: [PATCH] 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@...e.cz>
Signed-off-by: Heiko Carstens <heiko.carstens@...ibm.com>
---
 arch/s390/kernel/setup.c |    1 +
 1 file changed, 1 insertion(+)

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.9.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/