diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:48:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:48:30 +0100 |
| commit | b9974dc6bddd41fbdc2583f196a34fbcebd8b089 (patch) | |
| tree | 1a53efb9732453020b9157d17b2850df436235d9 /arch/powerpc/kernel | |
| parent | d733e00d7c10cc68333fbb88108bb15bb044f61b (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index d108715129e..5c33bc14bd9 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 */ |