diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:48:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:48:30 +0100 |
| commit | b9974dc6bddd41fbdc2583f196a34fbcebd8b089 (patch) | |
| tree | 1a53efb9732453020b9157d17b2850df436235d9 /arch | |
| parent | x86: update io_apic.c to the new cpumask code (diff) | |
| parent | Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
| download | linux-b9974dc6bddd41fbdc2583f196a34fbcebd8b089.tar.xz linux-b9974dc6bddd41fbdc2583f196a34fbcebd8b089.zip | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch')
| -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 d108715129e2..5c33bc14bd9f 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 29b2941cada0..45907c1dae66 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) |