From a6675a1e0a45ef1c337651fd96769db26dac2dbb Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Wed, 21 Mar 2012 16:33:47 -0700
Subject: [PATCH] --- yaml --- r: 292617 b: refs/heads/master c:
 dc3f21eadeea6d9898271ff32d35d5e00c6872ea h: refs/heads/master i:   292615:
 4b5ac797136667efab5035ea9334ab70f91bb7bb v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d0fcd41f363..3984f82d7d87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8447d950e7445cae71ad66d0e33784f8388aaf9d
+refs/heads/master: dc3f21eadeea6d9898271ff32d35d5e00c6872ea
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 856106036ba2..517299c808cb 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -34,6 +34,7 @@
 #include <linux/ptrace.h>
 #include <linux/freezer.h>
 #include <linux/ftrace.h>
+#include <linux/ratelimit.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/oom.h>
@@ -444,6 +445,8 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 	struct task_struct *t = p;
 	struct mm_struct *mm;
 	unsigned int victim_points = 0;
+	static DEFINE_RATELIMIT_STATE(oom_rs, DEFAULT_RATELIMIT_INTERVAL,
+					      DEFAULT_RATELIMIT_BURST);
 
 	/*
 	 * If the task is already exiting, don't alarm the sysadmin or kill
@@ -454,7 +457,7 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 		return;
 	}
 
-	if (printk_ratelimit())
+	if (__ratelimit(&oom_rs))
 		dump_header(p, gfp_mask, order, memcg, nodemask);
 
 	task_lock(p);