--- zzzz-none-000/linux-2.6.28.10/include/linux/memcontrol.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/include/linux/memcontrol.h	2010-03-10 09:25:12.000000000 +0000
@@ -71,84 +71,84 @@
 
 
 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
-static inline int mem_cgroup_charge(struct page *page,
-					struct mm_struct *mm, gfp_t gfp_mask)
+static inline int mem_cgroup_charge(struct page *page __attribute__((unused)),
+					struct mm_struct *mm __attribute__((unused)), gfp_t gfp_mask __attribute__((unused)))
 {
 	return 0;
 }
 
-static inline int mem_cgroup_cache_charge(struct page *page,
-					struct mm_struct *mm, gfp_t gfp_mask)
+static inline int mem_cgroup_cache_charge(struct page *page __attribute__((unused)),
+					struct mm_struct *mm __attribute__((unused)), gfp_t gfp_mask __attribute__((unused)))
 {
 	return 0;
 }
 
-static inline void mem_cgroup_uncharge_page(struct page *page)
+static inline void mem_cgroup_uncharge_page(struct page *page __attribute__((unused)))
 {
 }
 
-static inline void mem_cgroup_uncharge_cache_page(struct page *page)
+static inline void mem_cgroup_uncharge_cache_page(struct page *page __attribute__((unused)))
 {
 }
 
-static inline int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask)
+static inline int mem_cgroup_shrink_usage(struct mm_struct *mm __attribute__((unused)), gfp_t gfp_mask __attribute__((unused)))
 {
 	return 0;
 }
 
-static inline void mem_cgroup_move_lists(struct page *page, bool active)
+static inline void mem_cgroup_move_lists(struct page *page __attribute__((unused)), bool active __attribute__((unused)))
 {
 }
 
-static inline int mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *mem)
+static inline int mm_match_cgroup(struct mm_struct *mm __attribute__((unused)), struct mem_cgroup *mem __attribute__((unused)))
 {
 	return 1;
 }
 
-static inline int task_in_mem_cgroup(struct task_struct *task,
-				     const struct mem_cgroup *mem)
+static inline int task_in_mem_cgroup(struct task_struct *task __attribute__((unused)),
+				     const struct mem_cgroup *mem __attribute__((unused)))
 {
 	return 1;
 }
 
 static inline int
-mem_cgroup_prepare_migration(struct page *page, struct page *newpage)
+mem_cgroup_prepare_migration(struct page *page __attribute__((unused)), struct page *newpage __attribute__((unused)))
 {
 	return 0;
 }
 
-static inline void mem_cgroup_end_migration(struct page *page)
+static inline void mem_cgroup_end_migration(struct page *page __attribute__((unused)))
 {
 }
 
-static inline int mem_cgroup_calc_mapped_ratio(struct mem_cgroup *mem)
+static inline int mem_cgroup_calc_mapped_ratio(struct mem_cgroup *mem __attribute__((unused)))
 {
 	return 0;
 }
 
-static inline int mem_cgroup_reclaim_imbalance(struct mem_cgroup *mem)
+static inline int mem_cgroup_reclaim_imbalance(struct mem_cgroup *mem __attribute__((unused)))
 {
 	return 0;
 }
 
-static inline int mem_cgroup_get_reclaim_priority(struct mem_cgroup *mem)
+static inline int mem_cgroup_get_reclaim_priority(struct mem_cgroup *mem __attribute__((unused)))
 {
 	return 0;
 }
 
-static inline void mem_cgroup_note_reclaim_priority(struct mem_cgroup *mem,
-						int priority)
+static inline void mem_cgroup_note_reclaim_priority(struct mem_cgroup *mem __attribute__((unused)),
+						int priority __attribute__((unused)))
 {
 }
 
-static inline void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem,
-						int priority)
+static inline void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem __attribute__((unused)),
+						int priority __attribute__((unused)))
 {
 }
 
-static inline long mem_cgroup_calc_reclaim(struct mem_cgroup *mem,
-					struct zone *zone, int priority,
-					enum lru_list lru)
+static inline long mem_cgroup_calc_reclaim(struct mem_cgroup *mem __attribute__((unused)),
+					struct zone *zone __attribute__((unused)), int priority __attribute__((unused)),
+					enum lru_list lru __attribute__((unused)))
 {
 	return 0;
 }