---

yaml --- r: 334346 b: refs/heads/master c: 68687c8 h: refs/heads/master v: v3
git-mirror · Oct 15, 2012 · 3d94f11 · 3d94f11
1 parent bae1b58
commit 3d94f11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)