From 4cc6a77fb0857a1ddb2a13611e16b8a4fc6b2817 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Fri, 5 Mar 2010 13:43:51 -0800
Subject: [PATCH] --- yaml --- r: 186303 b: refs/heads/master c:
 52131292c069b74f4b5f3c786ff66ff6e82b0e69 h: refs/heads/master i:   186301:
 2c785938973c2543fc662b371435ee6f4e830634   186299:
 4763df1f49b0d6879774946d6d729402aa617d3f   186295:
 339279745db1776ab98d4cae01e8c3f4a28644a4   186287:
 e412dca301af80555374ce2166c83e2e1efae81a   186271:
 f58a0430bf2269fa1b073792622006f1fdeb4138   186239:
 a58d2b306fe789cac831021049243fade040fc63 v: v3

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

diff --git a/[refs] b/[refs]
index d2d003af65ae..b2966740dc08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 691e669ba8c64d31ac08d87b1751e6acfa3ff65e
+refs/heads/master: 52131292c069b74f4b5f3c786ff66ff6e82b0e69
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 9a3894dbf752..1530dbf1dab5 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -145,11 +145,14 @@ sub help {
 			__kprobes|
 			__ref
 		}x;
+
+# Notes to $Attribute:
+# We need \b after 'init' otherwise 'initconst' will cause a false positive in a check
 our $Attribute	= qr{
 			const|
 			__read_mostly|
 			__kprobes|
-			__(?:mem|cpu|dev|)(?:initdata|init)|
+			__(?:mem|cpu|dev|)(?:initdata|initconst|init\b)|
 			____cacheline_aligned|
 			____cacheline_aligned_in_smp|
 			____cacheline_internodealigned_in_smp|