From d41389ae068919196f39cfd81e288bed498d1a3a Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 17 Dec 2012 16:01:56 -0800
Subject: [PATCH] --- yaml --- r: 346419 b: refs/heads/master c:
 481eb486a88c9b068f0168ac4c21291802720933 h: refs/heads/master i:   346417:
 6fede8af22e640d6724ed8d46272af4f55c89d21   346415:
 765b59fc245e49285a26e8cd5b96f61c48ddeeb9 v: v3

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

diff --git a/[refs] b/[refs]
index a1e717a6ccf2..85206f32567a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cd7f3869c925622bbf420e1107a026d91dbd7f2
+refs/heads/master: 481eb486a88c9b068f0168ac4c21291802720933
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 6fa167758f82..3e9fee60642c 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -3009,10 +3009,12 @@ sub process {
 				}
 			}
 
-# check for line continuations outside of #defines
+# check for line continuations outside of #defines, preprocessor #, and asm
 
 		} else {
 			if ($prevline !~ /^..*\\$/ &&
+			    $line !~ /^\+\s*\#.*\\$/ &&		# preprocessor
+			    $line !~ /^\+.*\b(__asm__|asm)\b.*\\$/ &&	# asm
 			    $line =~ /^\+.*\\$/) {
 				WARN("LINE_CONTINUATIONS",
 				     "Avoid unnecessary line continuations\n" . $herecurr);