aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorZhang Yanfei <zhangyanfei@cn.fujitsu.com>2013-07-08 18:59:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 13:33:21 -0400
commitb8e748b6c32999f221ea4786557b8e7e6c4e4e7a (patch)
treef017d59c2b8bf3ba4df1b742e643a3fe1a83a3b4 /mm
parent9da3f59fbdb57c9447ddb42681f6ab98faef353a (diff)
mm/vmalloc.c: remove alloc_map from vmap_block
As we have removed the dead code in the vb_alloc, it seems there is no place to use the alloc_map. So there is no reason to maintain the alloc_map in vmap_block. Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmalloc.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 99d045a0a0eb..7ac2a1f8358a 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -754,7 +754,6 @@ struct vmap_block {
754 struct vmap_area *va; 754 struct vmap_area *va;
755 struct vmap_block_queue *vbq; 755 struct vmap_block_queue *vbq;
756 unsigned long free, dirty; 756 unsigned long free, dirty;
757 DECLARE_BITMAP(alloc_map, VMAP_BBMAP_BITS);
758 DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS); 757 DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS);
759 struct list_head free_list; 758 struct list_head free_list;
760 struct rcu_head rcu_head; 759 struct rcu_head rcu_head;
@@ -820,7 +819,6 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
820 vb->va = va; 819 vb->va = va;
821 vb->free = VMAP_BBMAP_BITS; 820 vb->free = VMAP_BBMAP_BITS;
822 vb->dirty = 0; 821 vb->dirty = 0;
823 bitmap_zero(vb->alloc_map, VMAP_BBMAP_BITS);
824 bitmap_zero(vb->dirty_map, VMAP_BBMAP_BITS); 822 bitmap_zero(vb->dirty_map, VMAP_BBMAP_BITS);
825 INIT_LIST_HEAD(&vb->free_list); 823 INIT_LIST_HEAD(&vb->free_list);
826 824
@@ -873,7 +871,6 @@ static void purge_fragmented_blocks(int cpu)
873 if (vb->free + vb->dirty == VMAP_BBMAP_BITS && vb->dirty != VMAP_BBMAP_BITS) { 871 if (vb->free + vb->dirty == VMAP_BBMAP_BITS && vb->dirty != VMAP_BBMAP_BITS) {
874 vb->free = 0; /* prevent further allocs after releasing lock */ 872 vb->free = 0; /* prevent further allocs after releasing lock */
875 vb->dirty = VMAP_BBMAP_BITS; /* prevent purging it again */ 873 vb->dirty = VMAP_BBMAP_BITS; /* prevent purging it again */
876 bitmap_fill(vb->alloc_map, VMAP_BBMAP_BITS);
877 bitmap_fill(vb->dirty_map, VMAP_BBMAP_BITS); 874 bitmap_fill(vb->dirty_map, VMAP_BBMAP_BITS);
878 spin_lock(&vbq->lock); 875 spin_lock(&vbq->lock);
879 list_del_rcu(&vb->free_list); 876 list_del_rcu(&vb->free_list);