summaryrefslogtreecommitdiffstats
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2015-08-23 21:35:23 +0200
committerJonathan Corbet <corbet@lwn.net>2015-08-23 21:54:33 +0200
commitf007492964c125cb3e88a51ba2e50c3b44d33ae0 (patch)
tree944fdf514cc9be3ff61cec6099c591bff5fe3966 /scripts/kernel-doc
parentscripts/kernel-doc: Adding cross-reference links to html documentation. (diff)
downloadlinux-f007492964c125cb3e88a51ba2e50c3b44d33ae0.tar.xz
linux-f007492964c125cb3e88a51ba2e50c3b44d33ae0.zip
kernel-doc: ignore unneeded attribute information
The kernel-doc script gets confused by __attribute__(()) strings in structures, so just clean the out. Also ignore the CRYPTO_MINALIGN_ATTR macro used in the crypto subsystem. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 3a4d895b9237..a7bf5f68aacb 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1799,7 +1799,9 @@ sub dump_struct($$) {
# strip kmemcheck_bitfield_{begin,end}.*;
$members =~ s/kmemcheck_bitfield_.*?;//gos;
# strip attributes
+ $members =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i;
$members =~ s/__aligned\s*\([^;]*\)//gos;
+ $members =~ s/\s*CRYPTO_MINALIGN_ATTR//gos;
create_parameterlist($members, ';', $file);
check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);