summaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 94172089f52f..9a90b096dc6b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -170,7 +170,7 @@ struct mem_cgroup_event {
170 */ 170 */
171 poll_table pt; 171 poll_table pt;
172 wait_queue_head_t *wqh; 172 wait_queue_head_t *wqh;
173 wait_queue_t wait; 173 wait_queue_entry_t wait;
174 struct work_struct remove; 174 struct work_struct remove;
175}; 175};
176 176
@@ -1479,10 +1479,10 @@ static DECLARE_WAIT_QUEUE_HEAD(memcg_oom_waitq);
1479 1479
1480struct oom_wait_info { 1480struct oom_wait_info {
1481 struct mem_cgroup *memcg; 1481 struct mem_cgroup *memcg;
1482 wait_queue_t wait; 1482 wait_queue_entry_t wait;
1483}; 1483};
1484 1484
1485static int memcg_oom_wake_function(wait_queue_t *wait, 1485static int memcg_oom_wake_function(wait_queue_entry_t *wait,
1486 unsigned mode, int sync, void *arg) 1486 unsigned mode, int sync, void *arg)
1487{ 1487{
1488 struct mem_cgroup *wake_memcg = (struct mem_cgroup *)arg; 1488 struct mem_cgroup *wake_memcg = (struct mem_cgroup *)arg;
@@ -3725,7 +3725,7 @@ static void memcg_event_remove(struct work_struct *work)
3725 * 3725 *
3726 * Called with wqh->lock held and interrupts disabled. 3726 * Called with wqh->lock held and interrupts disabled.
3727 */ 3727 */
3728static int memcg_event_wake(wait_queue_t *wait, unsigned mode, 3728static int memcg_event_wake(wait_queue_entry_t *wait, unsigned mode,
3729 int sync, void *key) 3729 int sync, void *key)
3730{ 3730{
3731 struct mem_cgroup_event *event = 3731 struct mem_cgroup_event *event =