Skip to content

Commit 70c95b0

Browse files
rddunlaptorvalds
authored andcommitted
scripts/kernel-doc: fix fatal error caused by cfg80211.h
include/net/cfg80211.h uses __must_check in functions that have kernel-doc notation. This was confusing scripts/kernel-doc, so have scripts/kernel-doc ignore "__must_check". Error(include/net/cfg80211.h:2702): cannot understand prototype: 'struct cfg80211_bss * __must_check cfg80211_inform_bss(...) Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent dcd6c92 commit 70c95b0

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

scripts/kernel-doc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use strict;
55
## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ##
66
## Copyright (C) 2000, 1 Tim Waugh <twaugh@redhat.com> ##
77
## Copyright (C) 2001 Simon Huggins ##
8-
## Copyright (C) 2005-2010 Randy Dunlap ##
8+
## Copyright (C) 2005-2012 Randy Dunlap ##
99
## ##
1010
## #define enhancements by Armin Kuster <akuster@mvista.com> ##
1111
## Copyright (c) 2000 MontaVista Software, Inc. ##
@@ -1785,6 +1785,7 @@ sub dump_function($$) {
17851785
$prototype =~ s/__devinit +//;
17861786
$prototype =~ s/__init +//;
17871787
$prototype =~ s/__init_or_module +//;
1788+
$prototype =~ s/__must_check +//;
17881789
$prototype =~ s/^#\s*define\s+//; #ak added
17891790
$prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;
17901791

0 commit comments

Comments
 (0)