The patch titled checkpatch: DEFINE_ macros are real definitions for exports has been added to the -mm tree. Its filename is checkpatch-define_-macros-are-real-definitions-for-exports.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: checkpatch: DEFINE_ macros are real definitions for exports From: Andy Whitcroft <apw@xxxxxxxxxxxx> When we want to confirm an export is directly after its definition we need to allow for DEFINE_ style macros. Add these to the execeptions. Refactor the exceptions. Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff -puN scripts/checkpatch.pl~checkpatch-define_-macros-are-real-definitions-for-exports scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-define_-macros-are-real-definitions-for-exports +++ a/scripts/checkpatch.pl @@ -1573,13 +1573,14 @@ sub process { if (($line =~ /EXPORT_SYMBOL.*\((.*)\)/) || ($line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) { my $name = $1; - if (($prevline !~ /^}/) && - ($prevline !~ /^\+}/) && - ($prevline !~ /^ }/) && - ($prevline !~ /^.DECLARE_$Ident\(\Q$name\E\)/) && - ($prevline !~ /^.LIST_HEAD\(\Q$name\E\)/) && - ($prevline !~ /^.$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(/) && - ($prevline !~ /\b\Q$name\E(?:\s+$Attribute)?\s*(?:;|=|\[)/)) { + if ($prevline !~ /(?: + ^.}| + ^.DEFINE_$Ident\(\Q$name\E\)| + ^.DECLARE_$Ident\(\Q$name\E\)| + ^.LIST_HEAD\(\Q$name\E\)| + ^.$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(| + \b\Q$name\E(?:\s+$Attribute)?\s*(?:;|=|\[) + )/x) { WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr); } } _ Patches currently in -mm which might be from apw@xxxxxxxxxxxx are mm-hugetlbc-make-functions-static-use-null-rather-than-0.patch checkpatch-square-brackets-exemption-for-array-slices-in-braces.patch checkpatch-values-double-ampersand-may-be-unary.patch checkpatch-conditional-indent-labels-have-different-indent-rules.patch checkpatch-switch-indent-allow-plain-return.patch checkpatch-add-tests-for-the-attribute-matcher.patch checkpatch-____cacheline_aligned-et-al-are-modifiers.patch checkpatch-complex-macros-fix-up-extension-handling.patch checkpatch-fix-up-comment-checks-search-to-scan-the-entire-block.patch checkpatch-include-asm-checks-should-be-anchored.patch checkpatch-reduce-warnings-for-include-of-asm-fooh-to-check-from-arch-barc.patch checkpatch-report-any-absolute-references-to-kernel-source-files.patch checkpatch-report-the-real-first-line-of-all-suspect-indents.patch checkpatch-suspect-indent-skip-over-preprocessor-label-and-blank-lines.patch checkpatch-%lx-tests-should-hand-%%-as-a-literal.patch checkpatch-report-the-correct-lines-for-single-statement-blocks.patch checkpatch-perform-indent-checks-on-perl.patch checkpatch-version-022.patch checkpatch-case-default-checks-should-only-check-changed-lines.patch checkpatch-suppress-errors-triggered-by-short-patch.patch checkpatch-handle-comment-quote-nesting-correctly.patch checkpatch-check-line-endings-in-text-format-files.patch checkpatch-suspect-indent-count-condition-lines-correctly.patch checkpatch-ensure-we-only-apply-checks-to-the-lines-within-hunks.patch checkpatch-version-023.patch checkpatch-do-is-not-a-possible-type.patch checkpatch-labels-are-not-possible-types.patch checkpatch-handle-do-without-braces-if-we-have-enough-context.patch checkpatch-macros-which-define-structure-members-are-not-complex.patch checkpatch-accept-any-sized-le-be-type.patch checkpatch-pull-out-known-acceptable-typedefs.patch checkpatch-suspect-code-indent-must-stop-at-else-elif.patch checkpatch-complex-macros-checks-miss-square-brackets.patch checkpatch-define_-macros-are-real-definitions-for-exports.patch checkpatch-trailing-statements-ensure-we-report-the-end-of-the-line.patch checkpatch-suspect-indent-handle-macro-continuation.patch checkpatch-allow-for-comments-either-side-of-a-brace-on-case.patch checkpatch-version-024.patch page-owner-tracking-leak-detector.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html