mm: memcontrol: clean up memory.events counting function

[linux-2.6-microblaze.git] / include / linux / memcontrol.h

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index cfa91a3..bc0c16e 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -287,17 +287,10 @@ static inline bool mem_cgroup_disabled(void)
        return !cgroup_subsys_enabled(memory_cgrp_subsys);
 }
 
-/**
- * mem_cgroup_events - count memory events against a cgroup
- * @memcg: the memory cgroup
- * @idx: the event index
- * @nr: the number of events to account for
- */
-static inline void mem_cgroup_events(struct mem_cgroup *memcg,
-                      enum mem_cgroup_events_index idx,
-                      unsigned int nr)
+static inline void mem_cgroup_event(struct mem_cgroup *memcg,
+                                   enum mem_cgroup_events_index idx)
 {
-       this_cpu_add(memcg->stat->events[idx], nr);
+       this_cpu_inc(memcg->stat->events[idx]);
        cgroup_file_notify(&memcg->events_file);
 }
 
@@ -614,9 +607,8 @@ static inline bool mem_cgroup_disabled(void)
        return true;
 }
 
-static inline void mem_cgroup_events(struct mem_cgroup *memcg,
-                                    enum mem_cgroup_events_index idx,
-                                    unsigned int nr)
+static inline void mem_cgroup_event(struct mem_cgroup *memcg,
+                                   enum mem_cgroup_events_index idx)
 {
 }