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

Commit a999cb04 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[ARM] 3035/1: RISCOS compat code fix 



Patch from Nicolas Pitre

From: Daniel Jacobowitz <dan@debian.org>

> I also fixed a bug that confused me greatly while trying to debug: one
> SIGILL has long been a SIGSEGV because of some broken RISCOS
> compatibility code.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dd5b295f

arch/arm/kernel/traps.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -345,7 +345,9 @@ static int bad_syscall(int n, struct pt_regs *regs) 
	struct thread_info *thread = current_thread_info();

	struct thread_info *thread = current_thread_info();

	siginfo_t info;

	siginfo_t info;





	if (current->personality != PER_LINUX && thread->exec_domain->handler) {

	if (current->personality != PER_LINUX &&

	    current->personality != PER_LINUX_32BIT &&

	    thread->exec_domain->handler) {

		thread->exec_domain->handler(n, regs);

		thread->exec_domain->handler(n, regs);

		return regs->ARM_r0;

		return regs->ARM_r0;

	}

	}