]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerJiri Slaby <jslaby@suse.cz>
Mon, 26 Jan 2015 13:39:05 +0000 (14:39 +0100)
commit3e0c111cf99888ffedbe3ee9ff4818127f4d8a4e
tree1820ce41b38a947732a58e566c9f133190934a39
parentbd15ad4f51c047fddaa073bf461a5e09e28b640d
scripts/kernel-doc: don't eat struct members with __aligned

commit 7b990789a4c3420fa57596b368733158e432d444 upstream.

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: 9dc30918b23f ("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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
scripts/kernel-doc