lkml.org 
[lkml]   [2012]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 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@de.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@suse.cz>
Signed-off-by: Heiko Carstens <heiko.carstens@de.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


\
 
 \ /
  Last update: 2012-03-05 14:15    [from the cache]
©2003-2011 Jasper Spaans