Commit a52519f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1bda7128 af4d3643

arch/powerpc/kernel/misc_32.S

+2 −2
Original line number Diff line number Diff line
@@ -486,13 +486,13 @@ _GLOBAL(_tlbil_va) 
	tlbsx	0,r3

	mfspr	r4,SPRN_MAS1		/* check valid */

	andis.	r3,r4,MAS1_VALID@h

	beqlr

	beq	1f

	rlwinm	r4,r4,0,1,31

	mtspr	SPRN_MAS1,r4

	tlbwe

	msync

	isync

	wrtee	r10

1:	wrtee	r10

	blr

#endif /* CONFIG_FSL_BOOKE */

arch/powerpc/lib/rheap.c

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ unsigned long rh_alloc_fixed(rh_info_t * info, unsigned long start, int size, co 
		be = blk->start + blk->size;

		if (s >= bs && e <= be)

			break;

		blk = NULL;

	}



	if (blk == NULL)