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

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: Fix corruption error in rh_alloc_fixed()
powerpc/fsl-booke: Fix the miss interrupt restore

Linus Torvalds a52519f2 1bda7128

+3 -2
unified split
+2 -2
arch/powerpc/kernel/misc_32.S
··· 486 tlbsx 0,r3 487 mfspr r4,SPRN_MAS1 /* check valid */ 488 andis. r3,r4,MAS1_VALID@h 489 - beqlr 490 rlwinm r4,r4,0,1,31 491 mtspr SPRN_MAS1,r4 492 tlbwe 493 msync 494 isync 495 - wrtee r10 496 blr 497 #endif /* CONFIG_FSL_BOOKE */ 498
··· 486 tlbsx 0,r3 487 mfspr r4,SPRN_MAS1 /* check valid */ 488 andis. r3,r4,MAS1_VALID@h 489 + beq 1f 490 rlwinm r4,r4,0,1,31 491 mtspr SPRN_MAS1,r4 492 tlbwe 493 msync 494 isync 495 + 1: wrtee r10 496 blr 497 #endif /* CONFIG_FSL_BOOKE */ 498
+1
arch/powerpc/lib/rheap.c
··· 556 be = blk->start + blk->size; 557 if (s >= bs && e <= be) 558 break; 559 } 560 561 if (blk == NULL)
··· 556 be = blk->start + blk->size; 557 if (s >= bs && e <= be) 558 break; 559 + blk = NULL; 560 } 561 562 if (blk == NULL)