aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2016-06-07 11:05:53 +0300
committerJani Nikula <jani.nikula@intel.com>2016-06-10 11:29:20 +0300
commitc9b2cfb3faece55df7f50b4ab76bc00ac8e06700 (patch)
treef3095ffc4c048dbc2063681700acb69e9a98c1a7 /scripts
parentkernel-doc: add support for specifying extra files for EXPORT_SYMBOLs (diff)
downloadlinux-dev-c9b2cfb3faece55df7f50b4ab76bc00ac8e06700.tar.xz
linux-dev-c9b2cfb3faece55df7f50b4ab76bc00ac8e06700.zip
kernel-doc: unify all EXPORT_SYMBOL scanning to one place
Scan all input files for EXPORT_SYMBOLs along with the explicitly specified export files before actually parsing anything. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kernel-doc18
1 files changed, 5 insertions, 13 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 9708a87c7069..932b3f34ff06 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -61,10 +61,10 @@ Output format selection (mutually exclusive):
Output selection (mutually exclusive):
-export Only output documentation for symbols that have been
exported using EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL()
- in the same FILE or any -export-file FILE.
+ in any input FILE or -export-file FILE.
-internal Only output documentation for symbols that have NOT been
exported using EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL()
- in the same FILE or any -export-file FILE.
+ in any input FILE or -export-file FILE.
-function NAME Only output documentation for the given function(s)
or DOC: section title(s). All other functions and DOC:
sections are ignored. May be specified multiple times.
@@ -2792,17 +2792,6 @@ sub process_file($) {
return;
}
- # two passes for -export and -internal
- if ($output_selection == OUTPUT_EXPORTED ||
- $output_selection == OUTPUT_INTERNAL) {
- while (<IN>) {
- if (/$export_symbol/o) {
- $function_table{$2} = 1;
- }
- }
- seek(IN, 0, 0);
- }
-
$. = 1;
$section_counter = 0;
@@ -3110,6 +3099,9 @@ if (open(SOURCE_MAP, "<.tmp_filelist.txt")) {
if ($output_selection == OUTPUT_EXPORTED ||
$output_selection == OUTPUT_INTERNAL) {
+
+ push(@export_file_list, @ARGV);
+
foreach (@export_file_list) {
chomp;
process_export_file($_);