From ca9248ad36d9b4f95edcf539322b9331b678a9c0 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 25 Jul 2011 17:13:27 -0700
Subject: [PATCH] --- yaml --- r: 259026 b: refs/heads/master c:
 6e60c02e9d9427f59842192bdb123cbeaf8bc9a0 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/checkpatch.pl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e0c06c19021c..2363cafee018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34d99219726ff4d3425b360d1e8d081627a73a00
+refs/heads/master: 6e60c02e9d9427f59842192bdb123cbeaf8bc9a0
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 8dd720ac0069..9d761c95eca2 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -257,9 +257,9 @@ sub help {
 )};
 
 our $logFunctions = qr{(?x:
-	printk|
-	[a-z]+_(emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)|
-	WARN|
+	printk(?:_ratelimited|_once|)|
+	[a-z0-9]+_(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
+	WARN(?:_RATELIMIT|_ONCE|)|
 	panic|
 	MODULE_[A-Z_]+
 )};