diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-23 15:11:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-23 16:41:27 -0700 |
| commit | 16ae1f223601c44e5cb65c99257ffae003504704 (patch) | |
| tree | 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6 /mm/vmalloc.c | |
| parent | 6f359f99b8c2ff3b09329611da00fe39a7c10e7e (diff) | |
| parent | d038e3dcfff6e3de132726a9c7174d8170032aa4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c
Almost entirely overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 0dd80222b20b..0b057628a7ba 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1683,7 +1683,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, if (fatal_signal_pending(current)) { area->nr_pages = i; - goto fail; + goto fail_no_warn; } if (node == NUMA_NO_NODE) @@ -1709,6 +1709,7 @@ fail: warn_alloc(gfp_mask, NULL, "vmalloc: allocation failure, allocated %ld of %ld bytes", (area->nr_pages*PAGE_SIZE), area->size); +fail_no_warn: vfree(area->addr); return NULL; } |