checkpatch: complex macros -- fix up extension handling

Only pull in new extension lines where the current contents ends with a \.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 303c3634198b..586f9a4f0ad0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1977,8 +1977,8 @@ sub process {
                         # Extract the remainder of the define (if any) and
                         # rip off surrounding spaces, and trailing \'s.
                         $rest = '';
-                        while ($off != 0 || ($cnt > 0 && $rest =~ /(?:^|\\)\s*$/)) {
-                                #print "ADDING $off <" . substr($lines[$ln - 1], $off) . ">\n";
+                        while ($off != 0 || ($cnt > 0 && $rest =~ /\\\s*$/)) {
+                                #print "ADDING cnt<$cnt> $off <" . substr($lines[$ln - 1], $off) . "> rest<$rest>\n";
                                 if ($off != 0 || $lines[$ln - 1] !~ /^-/) {
                                         $rest .= substr($lines[$ln - 1], $off) . "\n";
                                         $cnt--;