From: Johannes Berg Date: Wed, 10 Dec 2014 23:41:28 +0000 (-0800) Subject: scripts/kernel-doc: don't eat struct members with __aligned X-Git-Tag: omap-for-v3.19/fixes-rc1~142^2~183 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b990789a4c3420fa57596b368733158e432d444;p=pandora-kernel.git 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: 9dc30918b23f ("scripts/kernel-doc: handle struct member __aligned without numbers") Signed-off-by: Johannes Berg Cc: Nishanth Menon Cc: Randy Dunlap Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed