diff --git a/[refs] b/[refs]
index 9bda49d7f2fc..53f630d3caf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1ef277e2c88c80cfa00580469133e2215442c8d
+refs/heads/master: 24e1d81acd447c3a7ec9eb90f24c00edc5a4b09f
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 1c032b1fa9eb..303c3634198b 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -113,7 +113,10 @@
 			const|
 			__read_mostly|
 			__kprobes|
-			__(?:mem|cpu|dev|)(?:initdata|init)
+			__(?:mem|cpu|dev|)(?:initdata|init)|
+			____cacheline_aligned|
+			____cacheline_aligned_in_smp|
+			____cacheline_internodealigned_in_smp
 		  }x;
 our $Modifier;
 our $Inline	= qr{inline|__always_inline|noinline};