summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-06-29 14:54:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-01 11:26:40 -0700
commitd960eea974f5e500c0dcb95a934239cc1f481cfd (patch)
tree2c9b9fdd568ca55bd7c8c753fd212a6f41076cff
parent5c5d4e8eafd0e54c2134c23296b1d7996c304fe1 (diff)
downloadtalos-op-linux-d960eea974f5e500c0dcb95a934239cc1f481cfd.tar.gz
talos-op-linux-d960eea974f5e500c0dcb95a934239cc1f481cfd.zip
kernel-doc: move ignoring kmemcheck
Somehow I managed to generate a diff that put these 2 lines into the wrong function: should have been in dump_struct() instead of in dump_enum(). Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rwxr-xr-xscripts/kernel-doc4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index ed591e9b7d1d..b52d340d759d 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1426,6 +1426,8 @@ sub dump_struct($$) {
# strip comments:
$members =~ s/\/\*.*?\*\///gos;
$nested =~ s/\/\*.*?\*\///gos;
+ # strip kmemcheck_bitfield_{begin,end}.*;
+ $members =~ s/kmemcheck_bitfield_.*?;//gos;
create_parameterlist($members, ';', $file);
check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
@@ -1468,8 +1470,6 @@ sub dump_enum($$) {
}
}
- # strip kmemcheck_bitfield_{begin,end}.*;
- $members =~ s/kmemcheck_bitfield_.*?;//gos;
output_declaration($declaration_name,
'enum',
OpenPOWER on IntegriCloud