Commit 7b990789 authored Dec 10, 2014 by Johannes Berg Committed by Linus Torvalds Dec 10, 2014

scripts/kernel-doc: don't eat struct members with __aligned



The change from \d+ to .+ inside __aligned() means that the following
structure:

  struct test {
        u8 a __aligned(2);
        u8 b __aligned(2);
  };

essentially gets modified to

  struct test {
        u8 a;
  };

for purposes of kernel-doc, thus dropping a struct member, which in
turns causes warnings and invalid kernel-doc generation.

Fix this by replacing the catch-all (".") with anything that's not a
semicolon ("[^;]").

Fixes: 9dc30918 ("scripts/kernel-doc: handle struct member __aligned without numbers")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2ce8e7ed

scripts/kernel-doc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1753,7 +1753,7 @@ sub dump_struct($$) {
		# strip kmemcheck_bitfield_{begin,end}.*;
		$members =~ s/kmemcheck_bitfield_.*?;//gos;
		# strip attributes
		$members =~ s/__aligned\s*$.+$//gos;
		$members =~ s/__aligned\s$[^;]$//gos;

		create_parameterlist($members, ';', $file);
		check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);

Admin message