diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 10:15:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 10:15:35 +0200 |
| commit | 1079cac0f4eb7d968395378b1625979d4c818dd6 (patch) | |
| tree | d261058d95d27fe7250511d5fad69db30dc17731 /mm/vmalloc.c | |
| parent | tracing/filters: fix off-by-one bug (diff) | |
| parent | Linux 2.6.30-rc6 (diff) | |
| download | linux-1079cac0f4eb7d968395378b1625979d4c818dd6.tar.xz linux-1079cac0f4eb7d968395378b1625979d4c818dd6.zip | |
Merge commit 'v2.6.30-rc6' into tracing/core
Merge reason: we were on an -rc4 base, sync up to -rc6
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index fab19876b4d1..083716ea38c9 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -402,6 +402,7 @@ overflow: printk(KERN_WARNING "vmap allocation for size %lu failed: " "use vmalloc=<size> to increase size.\n", size); + kfree(va); return ERR_PTR(-EBUSY); } |