summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/misc_32.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-17 14:58:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-17 14:58:56 -0800
commita52519f2ce180890069fa7b1a92fa51d4448a0ba (patch)
treecae6d87adcba8ee831f9a50f3cff467254861718 /arch/powerpc/kernel/misc_32.S
parent1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff)
parentaf4d3643864ee5fcba0c97d77a424fa0b0346f8e (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc: powerpc: Fix corruption error in rh_alloc_fixed() powerpc/fsl-booke: Fix the miss interrupt restore
Diffstat (limited to 'arch/powerpc/kernel/misc_32.S')
-rw-r--r--arch/powerpc/kernel/misc_32.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index d108715129e2..5c33bc14bd9f 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -486,13 +486,13 @@ _GLOBAL(_tlbil_va)
tlbsx 0,r3
mfspr r4,SPRN_MAS1 /* check valid */
andis. r3,r4,MAS1_VALID@h
- beqlr
+ beq 1f
rlwinm r4,r4,0,1,31
mtspr SPRN_MAS1,r4
tlbwe
msync
isync
- wrtee r10
+1: wrtee r10
blr
#endif /* CONFIG_FSL_BOOKE */