diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-17 19:06:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-17 19:06:12 -0500 |
| commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
| tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /arch/powerpc/lib | |
| parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'arch/powerpc/lib')
| -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) |