diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-17 19:06:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-17 19:06:12 -0500 |
| commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
| tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /arch/powerpc/kernel | |
| parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
Merge branch 'linux-2.6' into next
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 d108715129e2..5c33bc14bd9f 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
| @@ -486,13 +486,13 @@ _GLOBAL(_tlbil_va) | |||
| 486 | tlbsx 0,r3 | 486 | tlbsx 0,r3 |
| 487 | mfspr r4,SPRN_MAS1 /* check valid */ | 487 | mfspr r4,SPRN_MAS1 /* check valid */ |
| 488 | andis. r3,r4,MAS1_VALID@h | 488 | andis. r3,r4,MAS1_VALID@h |
| 489 | beqlr | 489 | beq 1f |
| 490 | rlwinm r4,r4,0,1,31 | 490 | rlwinm r4,r4,0,1,31 |
| 491 | mtspr SPRN_MAS1,r4 | 491 | mtspr SPRN_MAS1,r4 |
| 492 | tlbwe | 492 | tlbwe |
| 493 | msync | 493 | msync |
| 494 | isync | 494 | isync |
| 495 | wrtee r10 | 495 | 1: wrtee r10 |
| 496 | blr | 496 | blr |
| 497 | #endif /* CONFIG_FSL_BOOKE */ | 497 | #endif /* CONFIG_FSL_BOOKE */ |
| 498 | 498 | ||