Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 048cd4e5 authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

compat: fix compile breakage on s390 



The new is_compat_task() define for the !COMPAT case in
include/linux/compat.h conflicts with a similar define in
arch/s390/include/asm/compat.h.

This is the minimal patch which fixes the build issues.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 500dd237

arch/s390/include/asm/compat.h

+0 −7
Original line number Diff line number Diff line
@@ -172,13 +172,6 @@ static inline int is_compat_task(void) 
	return is_32bit_task();

}



#else



static inline int is_compat_task(void)

{

	return 0;

}



#endif



static inline void __user *arch_compat_alloc_user_space(long len)

arch/s390/kernel/process.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <asm/irq.h>

#include <asm/timer.h>

#include <asm/nmi.h>

#include <asm/compat.h>

#include <asm/smp.h>

#include "entry.h"

arch/s390/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <linux/regset.h>

#include <linux/tracehook.h>

#include <linux/seccomp.h>

#include <linux/compat.h>

#include <trace/syscall.h>

#include <asm/compat.h>

#include <asm/segment.h>

#include <asm/page.h>

#include <asm/pgtable.h>

arch/s390/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/kexec.h>

#include <linux/crash_dump.h>

#include <linux/memory.h>

#include <linux/compat.h>



#include <asm/ipl.h>

#include <asm/uaccess.h>
@@ -59,7 +60,6 @@ 
#include <asm/ptrace.h>

#include <asm/sections.h>

#include <asm/ebcdic.h>

#include <asm/compat.h>

#include <asm/kvm_virtio.h>

#include <asm/diag.h>

arch/s390/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <asm/ucontext.h>

#include <asm/uaccess.h>

#include <asm/lowcore.h>

#include <asm/compat.h>

#include "entry.h"



#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))