Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123063
b: refs/heads/master
c: 06b9096
h: refs/heads/master
i:
  123061: 349dea8
  123059: cbc9ba7
  123055: 0a1d2af
v: v3
  • Loading branch information
Kumar Gala committed Dec 3, 2008
1 parent f0a2ed9 commit c669254
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3898895355f73973eb3aef3489e999d3fb8e2bc
refs/heads/master: 06b90969a7564fad888f67e9f7f4c3a51a16ef1d
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/kernel/head_fsl_booke.S
Original file line number Diff line number Diff line change
Expand Up @@ -751,15 +751,15 @@ finish_tlb_load:
iseleq r12, r12, r10

#ifdef CONFIG_PTE_64BIT
2: rlwimi r12, r13, 24, 0, 7 /* grab RPN[32:39] */
rlwimi r12, r13, 24, 0, 7 /* grab RPN[32:39] */
rlwimi r12, r11, 24, 8, 19 /* grab RPN[40:51] */
mtspr SPRN_MAS3, r12
BEGIN_FTR_SECTION
srwi r10, r13, 8 /* grab RPN[8:31] */
mtspr SPRN_MAS7, r10
END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS)
#else
2: rlwimi r11, r12, 0, 20, 31 /* Extract RPN from PTE and merge with perms */
rlwimi r11, r12, 0, 20, 31 /* Extract RPN from PTE and merge with perms */
mtspr SPRN_MAS3, r11
#endif
#ifdef CONFIG_E200
Expand Down

0 comments on commit c669254

Please sign in to comment.