Patchworkβ [08/18] markup_oops: use modinfo to avoid confusion with underscored module names

login
register
about
Submitter Andrew Morton
Date 2009-09-18 19:49:27
Message ID <200909181949.n8IJnSbl019077@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/48618/
State New
Headers show

Comments

Andrew Morton - 2009-09-18 19:49:27
From: Ozan Çaglayan <ozan@pardus.org.tr>

When EIP is at a module having an underscore in its name, the current code
fails to find it because the module filenames has '-' instead of '_'.  Use
modinfo for a better path finding.

Signed-off-by: Ozan Çaglayan <ozan@pardus.org.tr>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 scripts/markup_oops.pl |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Patch

diff -puN scripts/markup_oops.pl~markup_oops-use-modinfo-to-avoid-confusion-with-underscored-module-names scripts/markup_oops.pl
--- a/scripts/markup_oops.pl~markup_oops-use-modinfo-to-avoid-confusion-with-underscored-module-names
+++ a/scripts/markup_oops.pl
@@ -184,10 +184,7 @@  if ($target eq "0") {
 
 # if it's a module, we need to find the .ko file and calculate a load offset
 if ($module ne "") {
-	my $dir = dirname($filename);
-	$dir = $dir . "/";
-	my $mod = $module . ".ko";
-	my $modulefile = `find $dir -name $mod | head -1`;
+	my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`;
 	chomp($modulefile);
 	$filename = $modulefile;
 	if ($filename eq "") {