]> git.baikalelectronics.ru Git - kernel.git/commit
scripts/kernel-doc: don't eat struct members with __aligned
authorJohannes Berg <johannes.berg@intel.com>
Wed, 10 Dec 2014 23:41:28 +0000 (15:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 01:41:02 +0000 (17:41 -0800)
commitdeed68ea8d93e8ce05041e9bf2eedc6c7b8ecf6e
tree56bae2f8988614b61eb633f5741ce432c06171db
parent138117a012c8d04836e16ff3e52f595248e2b1fd
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: ff66fa98fba6 ("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>
scripts/kernel-doc