diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
| commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
| tree | 0f5fc519a68faca5318c296315c9b6c502907056 /arch/powerpc/lib/rheap.c | |
| parent | a98f8fd24fb24fcb9a359553e64dd6aac5cf4279 (diff) | |
| parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'arch/powerpc/lib/rheap.c')
| -rw-r--r-- | arch/powerpc/lib/rheap.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 | |||
| 556 | be = blk->start + blk->size; | 556 | be = blk->start + blk->size; |
| 557 | if (s >= bs && e <= be) | 557 | if (s >= bs && e <= be) |
| 558 | break; | 558 | break; |
| 559 | blk = NULL; | ||
| 559 | } | 560 | } |
| 560 | 561 | ||
| 561 | if (blk == NULL) | 562 | if (blk == NULL) |