Index: linux-2.6.17-rc6-cl/mm/vmstat.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/vmstat.c	2006-06-15 12:27:37.528446605 -0700
+++ linux-2.6.17-rc6-cl/mm/vmstat.c	2006-06-15 12:45:44.073579160 -0700
@@ -132,12 +132,12 @@ static inline s8 *diff_pointer(struct zo
 	return &zone_pcp(zone, smp_processor_id())->vm_stat_diff[item];
 }
 
-/*
- * For use when we know that interrupts are disabled.
- */
-void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
-				int delta)
+void mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
+					int delta)
 {
+	unsigned long flags;
+
+	local_irq_save(flags);
 	s8 *p;
 	long x;
 
@@ -150,19 +150,6 @@ void __mod_zone_page_state(struct zone *
 	}
 
 	*p = x;
-}
-EXPORT_SYMBOL(__mod_zone_page_state);
-
-/*
- * For an unknown interrupt state
- */
-void mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
-					int delta)
-{
-	unsigned long flags;
-
-	local_irq_save(flags);
-	__mod_zone_page_state(zone, item, delta);
 	local_irq_restore(flags);
 }
 EXPORT_SYMBOL(mod_zone_page_state);
@@ -310,13 +297,6 @@ EXPORT_SYMBOL(refresh_vm_stats);
  * The functions directly modify the zone and global counters.
  */
 
-void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
-				int delta)
-{
-	zone_page_state_add(delta, zone, item);
-}
-EXPORT_SYMBOL(__mod_zone_page_state);
-
 void mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
  				int delta)
 {
Index: linux-2.6.17-rc6-cl/include/linux/vmstat.h
===================================================================
--- linux-2.6.17-rc6-cl.orig/include/linux/vmstat.h	2006-06-15 12:27:37.532352613 -0700
+++ linux-2.6.17-rc6-cl/include/linux/vmstat.h	2006-06-15 12:44:16.299708060 -0700
@@ -60,13 +60,9 @@ static inline unsigned long node_page_st
 #define node_page_state(node, item) global_page_state(item)
 #endif
 
-void __mod_zone_page_state(struct zone *, enum zone_stat_item item, int);
 void __inc_zone_page_state(struct page *, enum zone_stat_item);
 void __dec_zone_page_state(struct page *, enum zone_stat_item);
 
-#define __add_zone_page_state(__z, __i, __d) __mod_zone_page_state(__z, __i, __d)
-#define __sub_zone_page_state(__z, __i, __d) __mod_zone_page_state(__z, __i,-(__d))
-
 void mod_zone_page_state(struct zone *, enum zone_stat_item, int);
 void inc_zone_page_state(struct page *, enum zone_stat_item);
 void dec_zone_page_state(struct page *, enum zone_stat_item);