remove MARK_USED() macros

PATCH William Lee Irwin III 1 participant 1 message Jun 2, 2002

Subsystems (2)

Memory management Page allocator

lore

Share & tools

lore

William Lee Irwin III

author

2002-06-02 22:32 UTC #0 lore raw

MARK_USED() only has two call sites within page_alloc.c and does not effectively serve to clarify the code. This patch removes it in favor of open-coding the __change_bit() at its call sites.

Against 2.5.19.

Cheers,
Bill

===== mm/page_alloc.c 1.69 vs edited =====

mm/page_alloc.c +2 -5

@@ -153,9 +153,6 @@
 	current->nr_local_pages++;
 }
 
-#define MARK_USED(index, order, area) \
-	__change_bit((index) >> (1+(order)), (area)->map)
-
 static inline struct page * expand (zone_t *zone, struct page *page,
 	 unsigned long index, int low, int high, free_area_t * area)
 {

@@ -167,7 +164,7 @@
 		high--;
 		size >>= 1;
 		list_add(&(page)->list, &(area)->free_list);
-		MARK_USED(index, high, area);
+		__change_bit(index >> (1+high), area->map);
 		index += size;
 		page += size;
 	}

@@ -197,7 +194,7 @@
 			list_del(curr);
 			index = page - zone->zone_mem_map;
 			if (curr_order != MAX_ORDER-1)
-				MARK_USED(index, curr_order, area);
+				__change_bit(index >> (1+curr_order), area->map);
 			zone->free_pages -= 1UL << order;
 
 			page = expand(zone, page, index, order, curr_order, area);