Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Clear sub-page HPTE present bits when demoting page size
[POWERPC] 4xx: Clear new TLB cache attribute bits in Data Storage vector
+10
-1
+6
-1
arch/powerpc/kernel/head_44x.S
+6
-1
arch/powerpc/kernel/head_44x.S
···
368
368
369
369
rlwimi r11,r13,0,26,31 /* Insert static perms */
370
370
371
-
rlwinm r11,r11,0,20,15 /* Clear U0-U3 */
371
+
/*
372
+
* Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added
373
+
* on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see
374
+
* include/asm-powerpc/pgtable-ppc32.h for details).
375
+
*/
376
+
rlwinm r11,r11,0,20,10
372
377
373
378
/* find the TLB index that caused the fault. It has to be here. */
374
379
tlbsx r10, 0, r10
+4
arch/powerpc/mm/hash_low_64.S
+4
arch/powerpc/mm/hash_low_64.S
···
568
568
ld r7,STK_PARM(r9)(r1) /* ssize */
569
569
ld r8,STK_PARM(r8)(r1) /* local */
570
570
bl .flush_hash_page
571
+
/* Clear out _PAGE_HPTE_SUB bits in the new linux PTE */
572
+
lis r0,_PAGE_HPTE_SUB@h
573
+
ori r0,r0,_PAGE_HPTE_SUB@l
574
+
andc r30,r30,r0
571
575
b htab_insert_pte
572
576
573
577
htab_bail_ok: