Parse EXPORT_SYMBOL_NS_GPL() in addition to EXPORT_SYMBOL_GPL() for use with the -export flag.
Acked-by: Jonathan Corbet corbet@lwn.net Signed-off-by: Jason Gunthorpe jgg@nvidia.com --- scripts/kernel-doc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index aea04365bc69d3..48e3feca31701a 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -256,6 +256,7 @@ my $doc_inline_sect = '\s**\s*(@\s*[\w][\w.]*\s*):(.*)'; my $doc_inline_end = '^\s**/\s*$'; my $doc_inline_oneline = '^\s*/**\s*(@[\w\s]+):\s*(.*)\s**/\s*$'; my $export_symbol = '^\s*EXPORT_SYMBOL(_GPL)?\s*(\s*(\w+)\s*)\s*;'; +my $export_symbol_ns = '^\s*EXPORT_SYMBOL_NS(_GPL)?\s*(\s*(\w+)\s*,\s*\w+)\s*;'; my $function_pointer = qr{([^(]*(*)\s*)\s*(([^)]*))}; my $attribute = qr{__attribute__\s*(([a-z0-9,_*\s()]*))}i;
@@ -1948,6 +1949,10 @@ sub process_export_file($) { next if (defined($nosymbol_table{$2})); $function_table{$2} = 1; } + if (/$export_symbol_ns/) { + next if (defined($nosymbol_table{$2})); + $function_table{$2} = 1; + } }
close(IN); @@ -2419,12 +2424,12 @@ found on PATH. =item -export
Only output documentation for the symbols that have been exported using -EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL() in any input FILE or -export-file FILE. +EXPORT_SYMBOL() and related macros in any input FILE or -export-file FILE.
=item -internal
Only output documentation for the symbols that have NOT been exported using -EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL() in any input FILE or -export-file FILE. +EXPORT_SYMBOL() and related macros in any input FILE or -export-file FILE.
=item -function NAME
@@ -2451,8 +2456,7 @@ Do not output DOC: sections.
=item -export-file FILE
-Specify an additional FILE in which to look for EXPORT_SYMBOL() and -EXPORT_SYMBOL_GPL(). +Specify an additional FILE in which to look for EXPORT_SYMBOL information.
To be used with -export or -internal.