The new version info format has a superset of symbols in the old format.
Since this is a tool for in-tree modules, we don't need to parse the old
one with this tool any longer.

Signed-off-by: Matthew Maurer <mmau...@google.com>
---
 scripts/export_report.pl | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/scripts/export_report.pl b/scripts/export_report.pl
index dcef915405f3..6a37df6f947f 100755
--- a/scripts/export_report.pl
+++ b/scripts/export_report.pl
@@ -114,31 +114,29 @@ foreach my $thismod (@allcfiles) {
        }
 
        my $state=0;
+       # State map:
+       # 0 - Looking for names
+       # 1 - Scanning names
+       # 2 - Done
        while ( <$module> ) {
                chomp;
                if ($state == 0) {
-                       $state = 1 if ($_ =~ /static const struct 
modversion_info/);
+                       $state = 1 if ($_ =~ /__used 
__section\("__version_ext_names"\)/);
                        next;
                }
                if ($state == 1) {
-                       $state = 2 if ($_ =~ /__used 
__section\("__versions"\)/);
-                       next;
-               }
-               if ($state == 2) {
-                       if ( $_ =~ /};/ ) {
-                               $state = 3;
-                               next;
-                       }
-                       if ( $_ !~ /0x[0-9a-f]+,/ ) {
+                       if ( $_ =~ /;/ ) {
+                               $state = 2;
                                next;
                        }
-                       my $sym = (split /([,"])/,)[4];
+                       $_ =~ /"(.*)\\0"/;
+                       my $sym = $1;
                        my ($module, $value, $symbol, $gpl) = @{$SYMBOL{$sym}};
                        $SYMBOL{ $sym } =  [ $module, $value+1, $symbol, $gpl];
                        push(@{$MODULE{$thismod}} , $sym);
                }
        }
-       if ($state != 3) {
+       if ($state != 2) {
                warn "WARNING:$thismod is not built with CONFIG_MODVERSIONS 
enabled\n";
                $modversion_warnings++;
        }
-- 
2.43.0.rc0.421.g78406f8d94-goog


Reply via email to