diff options
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 1d34d75366a7..ab8494cde007 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -452,13 +452,6 @@ overflow: | |||
| 452 | return ERR_PTR(-EBUSY); | 452 | return ERR_PTR(-EBUSY); |
| 453 | } | 453 | } |
| 454 | 454 | ||
| 455 | static void rcu_free_va(struct rcu_head *head) | ||
| 456 | { | ||
| 457 | struct vmap_area *va = container_of(head, struct vmap_area, rcu_head); | ||
| 458 | |||
| 459 | kfree(va); | ||
| 460 | } | ||
| 461 | |||
| 462 | static void __free_vmap_area(struct vmap_area *va) | 455 | static void __free_vmap_area(struct vmap_area *va) |
| 463 | { | 456 | { |
| 464 | BUG_ON(RB_EMPTY_NODE(&va->rb_node)); | 457 | BUG_ON(RB_EMPTY_NODE(&va->rb_node)); |
| @@ -491,7 +484,7 @@ static void __free_vmap_area(struct vmap_area *va) | |||
| 491 | if (va->va_end > VMALLOC_START && va->va_end <= VMALLOC_END) | 484 | if (va->va_end > VMALLOC_START && va->va_end <= VMALLOC_END) |
| 492 | vmap_area_pcpu_hole = max(vmap_area_pcpu_hole, va->va_end); | 485 | vmap_area_pcpu_hole = max(vmap_area_pcpu_hole, va->va_end); |
| 493 | 486 | ||
| 494 | call_rcu(&va->rcu_head, rcu_free_va); | 487 | kfree_rcu(va, rcu_head); |
| 495 | } | 488 | } |
| 496 | 489 | ||
| 497 | /* | 490 | /* |
| @@ -837,13 +830,6 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask) | |||
| 837 | return vb; | 830 | return vb; |
| 838 | } | 831 | } |
| 839 | 832 | ||
| 840 | static void rcu_free_vb(struct rcu_head *head) | ||
| 841 | { | ||
| 842 | struct vmap_block *vb = container_of(head, struct vmap_block, rcu_head); | ||
| 843 | |||
| 844 | kfree(vb); | ||
| 845 | } | ||
| 846 | |||
| 847 | static void free_vmap_block(struct vmap_block *vb) | 833 | static void free_vmap_block(struct vmap_block *vb) |
| 848 | { | 834 | { |
| 849 | struct vmap_block *tmp; | 835 | struct vmap_block *tmp; |
| @@ -856,7 +842,7 @@ static void free_vmap_block(struct vmap_block *vb) | |||
| 856 | BUG_ON(tmp != vb); | 842 | BUG_ON(tmp != vb); |
| 857 | 843 | ||
| 858 | free_vmap_area_noflush(vb->va); | 844 | free_vmap_area_noflush(vb->va); |
| 859 | call_rcu(&vb->rcu_head, rcu_free_vb); | 845 | kfree_rcu(vb, rcu_head); |
| 860 | } | 846 | } |
| 861 | 847 | ||
| 862 | static void purge_fragmented_blocks(int cpu) | 848 | static void purge_fragmented_blocks(int cpu) |
