summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2017-11-29 15:20:03 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-25 11:07:58 +0100
commit9537ff76fa06b7dfac07a6634d213282d6406fec (patch)
tree3b92469c3b1f634c5283979fb978b22d9eec0a65 /scripts
parentb0d049e9131406607cabe6e508463584613fb36e (diff)
downloadlinux-stable-9537ff76fa06b7dfac07a6634d213282d6406fec.tar.gz
linux-stable-9537ff76fa06b7dfac07a6634d213282d6406fec.tar.bz2
linux-stable-9537ff76fa06b7dfac07a6634d213282d6406fec.zip
scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none
[ Upstream commit e814bccbafece52a24e152d2395b5d49eef55841 ] My bisect scripts starting running into build failures when trying to compile 4.15-rc1 with the builds failing with things like: drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2078: error: Cannot parse struct or union! The line in question is actually just a #define, but after some digging it turns out that my scripts pass W=1 and since commit 3a025e1d1c2ea ("Add optional check for bad kernel-doc comments") that results in kernel-doc running on each source file. The file in question has a badly formatted comment immediately before the #define: /** * struct brcmf_skbuff_cb reserves first two bytes in sk_buff::cb for * bus layer usage. */ which causes the regex in dump_struct to fail (lack of braces following struct declaration) and kernel-doc returns 1, which causes the build to fail. Fix the issue by always returning 0 from kernel-doc when invoked with -none. It successfully generates no documentation, and prints out any issues. Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kernel-doc2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 8323ff9dec71..8bcf90407929 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -3216,4 +3216,4 @@ if ($verbose && $warnings) {
print STDERR "$warnings warnings\n";
}
-exit($errors);
+exit($output_mode eq "none" ? 0 : $errors);