crypto: talitos - fix ctr-aes-talitos

[linux.git] / include / linux / memcontrol.h

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 3914e3dd61680a9bc8814d9b9a386c59611eca81..69966c461d1c1164c155f3c5ff2ee9d4c7220911 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -484,11 +484,13 @@ bool mem_cgroup_oom_synchronize(bool wait);
 extern int do_swap_account;
 #endif
 
-void lock_page_memcg(struct page *page);
+struct mem_cgroup *lock_page_memcg(struct page *page);
+void __unlock_page_memcg(struct mem_cgroup *memcg);
 void unlock_page_memcg(struct page *page);
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline unsigned long memcg_page_state(struct mem_cgroup *memcg,
-                                            enum memcg_stat_item idx)
+                                            int idx)
 {
        long val = 0;
        int cpu;
@@ -502,15 +504,17 @@ static inline unsigned long memcg_page_state(struct mem_cgroup *memcg,
        return val;
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void __mod_memcg_state(struct mem_cgroup *memcg,
-                                    enum memcg_stat_item idx, int val)
+                                    int idx, int val)
 {
        if (!mem_cgroup_disabled())
                __this_cpu_add(memcg->stat->count[idx], val);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void mod_memcg_state(struct mem_cgroup *memcg,
-                                  enum memcg_stat_item idx, int val)
+                                  int idx, int val)
 {
        if (!mem_cgroup_disabled())
                this_cpu_add(memcg->stat->count[idx], val);
@@ -534,14 +538,14 @@ static inline void mod_memcg_state(struct mem_cgroup *memcg,
  * Kernel pages are an exception to this, since they'll never move.
  */
 static inline void __mod_memcg_page_state(struct page *page,
-                                         enum memcg_stat_item idx, int val)
+                                         int idx, int val)
 {
        if (page->mem_cgroup)
                __mod_memcg_state(page->mem_cgroup, idx, val);
 }
 
 static inline void mod_memcg_page_state(struct page *page,
-                                       enum memcg_stat_item idx, int val)
+                                       int idx, int val)
 {
        if (page->mem_cgroup)
                mod_memcg_state(page->mem_cgroup, idx, val);
@@ -631,8 +635,9 @@ static inline void count_memcg_events(struct mem_cgroup *memcg,
                this_cpu_add(memcg->stat->events[idx], count);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void count_memcg_page_event(struct page *page,
-                                         enum memcg_stat_item idx)
+                                         int idx)
 {
        if (page->mem_cgroup)
                count_memcg_events(page->mem_cgroup, idx, 1);
@@ -809,7 +814,12 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
 {
 }
 
-static inline void lock_page_memcg(struct page *page)
+static inline struct mem_cgroup *lock_page_memcg(struct page *page)
+{
+       return NULL;
+}
+
+static inline void __unlock_page_memcg(struct mem_cgroup *memcg)
 {
 }
 
@@ -840,31 +850,31 @@ static inline bool mem_cgroup_oom_synchronize(bool wait)
 }
 
 static inline unsigned long memcg_page_state(struct mem_cgroup *memcg,
-                                            enum memcg_stat_item idx)
+                                            int idx)
 {
        return 0;
 }
 
 static inline void __mod_memcg_state(struct mem_cgroup *memcg,
-                                    enum memcg_stat_item idx,
+                                    int idx,
                                     int nr)
 {
 }
 
 static inline void mod_memcg_state(struct mem_cgroup *memcg,
-                                  enum memcg_stat_item idx,
+                                  int idx,
                                   int nr)
 {
 }
 
 static inline void __mod_memcg_page_state(struct page *page,
-                                         enum memcg_stat_item idx,
+                                         int idx,
                                          int nr)
 {
 }
 
 static inline void mod_memcg_page_state(struct page *page,
-                                       enum memcg_stat_item idx,
+                                       int idx,
                                        int nr)
 {
 }
@@ -918,7 +928,7 @@ static inline void count_memcg_events(struct mem_cgroup *memcg,
 }
 
 static inline void count_memcg_page_event(struct page *page,
-                                         enum memcg_stat_item idx)
+                                         int idx)
 {
 }
 
@@ -928,26 +938,30 @@ void count_memcg_event_mm(struct mm_struct *mm, enum vm_event_item idx)
 }
 #endif /* CONFIG_MEMCG */
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void __inc_memcg_state(struct mem_cgroup *memcg,
-                                    enum memcg_stat_item idx)
+                                    int idx)
 {
        __mod_memcg_state(memcg, idx, 1);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void __dec_memcg_state(struct mem_cgroup *memcg,
-                                    enum memcg_stat_item idx)
+                                    int idx)
 {
        __mod_memcg_state(memcg, idx, -1);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void __inc_memcg_page_state(struct page *page,
-                                         enum memcg_stat_item idx)
+                                         int idx)
 {
        __mod_memcg_page_state(page, idx, 1);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void __dec_memcg_page_state(struct page *page,
-                                         enum memcg_stat_item idx)
+                                         int idx)
 {
        __mod_memcg_page_state(page, idx, -1);
 }
@@ -976,26 +990,30 @@ static inline void __dec_lruvec_page_state(struct page *page,
        __mod_lruvec_page_state(page, idx, -1);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void inc_memcg_state(struct mem_cgroup *memcg,
-                                  enum memcg_stat_item idx)
+                                  int idx)
 {
        mod_memcg_state(memcg, idx, 1);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void dec_memcg_state(struct mem_cgroup *memcg,
-                                  enum memcg_stat_item idx)
+                                  int idx)
 {
        mod_memcg_state(memcg, idx, -1);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void inc_memcg_page_state(struct page *page,
-                                       enum memcg_stat_item idx)
+                                       int idx)
 {
        mod_memcg_page_state(page, idx, 1);
 }
 
+/* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void dec_memcg_page_state(struct page *page,
-                                       enum memcg_stat_item idx)
+                                       int idx)
 {
        mod_memcg_page_state(page, idx, -1);
 }