From a7ff060c077804e7e43cbee10ea2ad6e457a7a41 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 15 Dec 2011 01:05:10 +0000
Subject: [PATCH] --- yaml --- r: 278796 b: refs/heads/master c:
 c48e074c7c75c0de4652ea5f5bf4e74c8cf4e3dd h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/ipv4/tcp_memcontrol.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 875de226601e..72a07a88674d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 888bdaa9b2c426dcca214e6efd388080938082cb
+refs/heads/master: c48e074c7c75c0de4652ea5f5bf4e74c8cf4e3dd
diff --git a/trunk/net/ipv4/tcp_memcontrol.c b/trunk/net/ipv4/tcp_memcontrol.c
index 171d7b64f803..7fed04f875c1 100644
--- a/trunk/net/ipv4/tcp_memcontrol.c
+++ b/trunk/net/ipv4/tcp_memcontrol.c
@@ -44,7 +44,7 @@ static inline struct tcp_memcontrol *tcp_from_cgproto(struct cg_proto *cg_proto)
 
 static void memcg_tcp_enter_memory_pressure(struct sock *sk)
 {
-	if (!sk->sk_cgrp->memory_pressure)
+	if (sk->sk_cgrp->memory_pressure)
 		*sk->sk_cgrp->memory_pressure = 1;
 }
 EXPORT_SYMBOL(memcg_tcp_enter_memory_pressure);