From 3d94f11041515d3d7797da882810207762de8c86 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 15 Oct 2012 00:16:49 +0100 Subject: [PATCH] --- yaml --- r: 334346 b: refs/heads/master c: 68687c842caefd5386d47a571fb4725df3556891 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/entry-common.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a3363d516ae6..37a6e7c91074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddffeb8c4d0331609ef2581d84de4d763607bd37 +refs/heads/master: 68687c842caefd5386d47a571fb4725df3556891 diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index 417bac1846bd..34711757ba59 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -88,9 +88,9 @@ ENTRY(ret_from_fork) bl schedule_tail cmp r5, #0 movne r0, r4 - movne lr, pc + adrne lr, BSYM(1f) movne pc, r5 - get_thread_info tsk +1: get_thread_info tsk b ret_slow_syscall ENDPROC(ret_from_fork)