aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2015-08-23 15:35:23 -0400
committerJonathan Corbet <corbet@lwn.net>2015-08-23 15:54:33 -0400
commitf007492964c125cb3e88a51ba2e50c3b44d33ae0 (patch)
tree944fdf514cc9be3ff61cec6099c591bff5fe3966
parent5699f871d2d51ce40012501378670613d4d49214 (diff)
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>
-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($$) {
1799 # strip kmemcheck_bitfield_{begin,end}.*; 1799 # strip kmemcheck_bitfield_{begin,end}.*;
1800 $members =~ s/kmemcheck_bitfield_.*?;//gos; 1800 $members =~ s/kmemcheck_bitfield_.*?;//gos;
1801 # strip attributes 1801 # strip attributes
1802 $members =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i;
1802 $members =~ s/__aligned\s*\([^;]*\)//gos; 1803 $members =~ s/__aligned\s*\([^;]*\)//gos;
1804 $members =~ s/\s*CRYPTO_MINALIGN_ATTR//gos;
1803 1805
1804 create_parameterlist($members, ';', $file); 1806 create_parameterlist($members, ';', $file);
1805 check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); 1807 check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);