patch-2.4.0-test6 linux/drivers/char/planb.c

• Lines: 26
• Date: Mon Aug 7 21:01:36 2000
• Orig file: v2.4.0-test5/linux/drivers/char/planb.c
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/char/planb.c linux/drivers/char/planb.c
@@ -136,13 +136,12 @@
 								|GFP_DMA, 0);
 		if (!pb->rawbuf[i])
 			break;
-		set_bit(PG_reserved, &mem_map[MAP_NR(pb->rawbuf[i])].flags);
+		mem_map_reserve(virt_to_page(pb->rawbuf[i]));
 	}
 	if (i-- < npage) {
 		printk(KERN_DEBUG "PlanB: init_grab: grab buffer not allocated\n");
 		for (; i > 0; i--) {
-			clear_bit(PG_reserved,
-				&mem_map[MAP_NR(pb->rawbuf[i])].flags);
+			mem_map_unreserve(virt_to_page(pb->rawbuf[i]));
 			free_pages((unsigned long)pb->rawbuf[i], 0);
 		}
 		kfree(pb->rawbuf);
@@ -435,8 +434,7 @@
 	}
 	if(pb->rawbuf) {
 		for (i = 0; i < pb->rawbuf_size; i++) {
-			clear_bit(PG_reserved,
-				&mem_map[MAP_NR(pb->rawbuf[i])].flags);
+			mem_map_unreserve(virt_to_page(pb->rawbuf[i]));
 			free_pages((unsigned long)pb->rawbuf[i], 0);
 		}
 		kfree(pb->rawbuf);