diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
| commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
| tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /arch/powerpc | |
| parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
| download | linux-3.10-c280266a326ccabeb64b6d69fa4fd21faf5bf354.tar.gz linux-3.10-c280266a326ccabeb64b6d69fa4fd21faf5bf354.tar.bz2 linux-3.10-c280266a326ccabeb64b6d69fa4fd21faf5bf354.zip | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 4 | ||||
| -rw-r--r-- | arch/powerpc/lib/rheap.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index d108715129e..5c33bc14bd9 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -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 */ diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c index 29b2941cada..45907c1dae6 100644 --- a/arch/powerpc/lib/rheap.c +++ b/arch/powerpc/lib/rheap.c @@ -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) |