From 4dc4455c2a9fb93a845bcf036e0c907799842966 Mon Sep 17 00:00:00 2001
From: Hui Zhu <hui.zhu@windriver.com>
Date: Mon, 1 Feb 2010 13:41:22 +0800
Subject: [PATCH] --- yaml --- r: 199516 b: refs/heads/master c:
 59dde3853e07aaadc2b63abd16c954d5b0606cf1 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/scripts/markup_oops.pl | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bdc2276ea82d..fac3d6fcf287 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52e13e219d5930fb8fb774050e6ecffa244a60a9
+refs/heads/master: 59dde3853e07aaadc2b63abd16c954d5b0606cf1
diff --git a/trunk/scripts/markup_oops.pl b/trunk/scripts/markup_oops.pl
index a7e8e019e03d..90e1d9aa35b5 100644
--- a/trunk/scripts/markup_oops.pl
+++ b/trunk/scripts/markup_oops.pl
@@ -23,10 +23,10 @@
 # Get options
 Getopt::Long::GetOptions(
 	'cross-compile|c=s'	=> \$cross_compile,
-	'module|m=s'	=> \$modulefile,
+	'module|m=s'		=> \$modulefile,
 	'help|h'		=> \&usage,
-);
-my $vmlinux_name = $ARGV[$#ARGV];
+) || usage ();
+my $vmlinux_name = $ARGV[0];
 if (!defined($vmlinux_name)) {
 	my $kerver = `uname -r`;
 	chomp($kerver);
@@ -193,7 +193,7 @@ sub process_x86_regs
 # if it's a module, we need to find the .ko file and calculate a load offset
 if ($module ne "") {
 	if ($modulefile eq "") {
-		my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`;
+		$modulefile = `modinfo -F filename $module`;
 		chomp($modulefile);
 	}
 	$filename = $modulefile;
@@ -362,7 +362,7 @@ sub usage {
 
 OPTION:
   -c, --cross-compile CROSS_COMPILE	Specify the prefix used for toolchain.
-  -m, --module MODULE_DIRNAME		Specify the module directory name.
+  -m, --module MODULE_DIRNAME		Specify the module filename.
   -h, --help				Help.
 EOT
 	exit;