tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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/mm: Fix Respect _PAGE_COHERENT on classic ppc32 SW TLB load machines

Linus Torvalds b0dcb4a9 59fcbdda

+9
+9
arch/powerpc/kernel/head_32.S
··· 513 513 rlwimi r3,r3,32-1,31,31 /* _PAGE_USER -> PP lsb */ 514 514 ori r1,r1,0xe04 /* clear out reserved bits */ 515 515 andc r1,r3,r1 /* PP = user? (rw&dirty? 2: 3): 0 */ 516 + BEGIN_FTR_SECTION 517 + rlwinm r1,r1,0,~_PAGE_COHERENT /* clear M (coherence not required) */ 518 + END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT) 516 519 mtspr SPRN_RPA,r1 517 520 mfspr r3,SPRN_IMISS 518 521 tlbli r3 ··· 590 587 rlwimi r3,r3,32-1,31,31 /* _PAGE_USER -> PP lsb */ 591 588 ori r1,r1,0xe04 /* clear out reserved bits */ 592 589 andc r1,r3,r1 /* PP = user? (rw&dirty? 2: 3): 0 */ 590 + BEGIN_FTR_SECTION 591 + rlwinm r1,r1,0,~_PAGE_COHERENT /* clear M (coherence not required) */ 592 + END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT) 593 593 mtspr SPRN_RPA,r1 594 594 mfspr r3,SPRN_DMISS 595 595 tlbld r3 ··· 661 655 rlwimi r3,r3,32-1,30,30 /* _PAGE_USER -> PP msb */ 662 656 li r1,0xe05 /* clear out reserved bits & PP lsb */ 663 657 andc r1,r3,r1 /* PP = user? 2: 0 */ 658 + BEGIN_FTR_SECTION 659 + rlwinm r1,r1,0,~_PAGE_COHERENT /* clear M (coherence not required) */ 660 + END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT) 664 661 mtspr SPRN_RPA,r1 665 662 mfspr r3,SPRN_DMISS 666 663 tlbld r3