diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-18 01:06:12 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-18 01:06:12 +0100 |
| commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
| tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /arch/powerpc/lib | |
| parent | Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/po... (diff) | |
| parent | Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
| download | linux-c280266a326ccabeb64b6d69fa4fd21faf5bf354.tar.xz linux-c280266a326ccabeb64b6d69fa4fd21faf5bf354.zip | |
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 be = blk->start + blk->size; if (s >= bs && e <= be) break; + blk = NULL; } if (blk == NULL) |