kernel-doc: move ignoring kmemcheck

rddunlap · torvalds · commit d960eea974f5 · 2009-07-01T11:26:40.000-07:00
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 &lt;randy.dunlap@oracle.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git 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',

Original file line number	Diff line number	Diff line change
`@@ -1426,6 +1426,8 @@ sub dump_struct($$) {`
`1426`	`1426`	`# strip comments:`
`1427`	`1427`	`$members =~ s/\/\.?\*\///gos;`
`1428`	`1428`	`$nested =~ s/\/\.?\*\///gos;`
	`1429`	`+ # strip kmemcheck_bitfield_{begin,end}.*;`
	`1430`	`+ $members =~ s/kmemcheck_bitfield_.*?;//gos;`
`1429`	`1431`
`1430`	`1432`	`create_parameterlist($members, ';', $file);`
`1431`	`1433`	`check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);`
`@@ -1468,8 +1470,6 @@ sub dump_enum($$) {`
`1468`	`1470`	`}`
`1469`	`1471`
`1470`	`1472`	`}`
`1471`		`- # strip kmemcheck_bitfield_{begin,end}.*;`
`1472`		`- $members =~ s/kmemcheck_bitfield_.*?;//gos;`
`1473`	`1473`
`1474`	`1474`	`output_declaration($declaration_name,`
`1475`	`1475`	`'enum',`