diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-03-23 13:35:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:31:19 -0700 |
commit | ef5da59f12602815baa8fad98241b77dedea3b31 (patch) | |
tree | 2a53455ebd567183670eeaf5cc913a460ba1bf34 /scripts | |
parent | 05731b979476969d4d1cbbcb535fc0f5ea90dba7 (diff) | |
download | linux-stable-ef5da59f12602815baa8fad98241b77dedea3b31.tar.gz linux-stable-ef5da59f12602815baa8fad98241b77dedea3b31.tar.bz2 linux-stable-ef5da59f12602815baa8fad98241b77dedea3b31.zip |
scripts/kernel-doc: handle struct member __aligned
scripts/kernel-doc erroneously says:
Warning(include/linux/skbuff.h:410): Excess struct/union/enum/typedef member 'cb' description in 'sk_buff'
on this line in struct sk_buff:
char cb[48] __aligned(8);
due to treating the last field as the struct member name, so teach
kernel-doc to ignore __aligned(x) in structs.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/kernel-doc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index c7865c362d28..c297eb4785d6 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1424,6 +1424,8 @@ sub dump_struct($$) { $nested =~ s/\/\*.*?\*\///gos; # strip kmemcheck_bitfield_{begin,end}.*; $members =~ s/kmemcheck_bitfield_.*?;//gos; + # strip attributes + $members =~ s/__aligned\s*\(\d+\)//gos; create_parameterlist($members, ';', $file); check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); |