--- zzzz-none-000/linux-2.4.17/mm/page_alloc.c	2001-11-20 00:35:40.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/mm/page_alloc.c	2004-11-24 13:22:34.000000000 +0000
@@ -19,6 +19,8 @@
 #include <linux/slab.h>
 #include <linux/compiler.h>
 
+#include <linux/trace.h>
+
 int nr_swap_pages;
 int nr_active_pages;
 int nr_inactive_pages;
@@ -84,6 +86,9 @@
 		BUG();
 	if (PageActive(page))
 		BUG();
+
+	TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_FREE, order);
+
 	page->flags &= ~((1<<PG_referenced) | (1<<PG_dirty));
 
 	if (current->flags & PF_FREE_PAGES)
@@ -410,6 +415,7 @@
 	page = alloc_pages(gfp_mask, order);
 	if (!page)
 		return 0;
+	TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_ALLOC, order);
 	return (unsigned long) page_address(page);
 }
 
@@ -735,7 +741,7 @@
 			struct page *page = mem_map + offset + i;
 			page->zone = zone;
 			if (j != ZONE_HIGHMEM)
-				page->virtual = __va(zone_start_paddr);
+				page->virtual = (void*)__va(zone_start_paddr);
 			zone_start_paddr += PAGE_SIZE;
 		}