From: Arnaud Patard <apatard@mandriva.com>
Date: Sat, 20 Sep 2008 03:16:25 +0000 (-0700)
Subject: fastboot: Fix bootgraph.pl initcall name regexp
X-Git-Tag: v2.6.28-rc1~578^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8bd9890e94627bc1ef372085e64dda7f9e307e82;p=linux-2.6-omap-h63xx.git

fastboot: Fix bootgraph.pl initcall name regexp

The regexp used to match the start and the end of an initcall
are matching only on [a-zA-Z\_]. This rules out initcalls with
a number in them. This patch is fixing that.

Signed-off-by: Arnaud Patard <apatard@mandriva.com>
---

diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index 4e5f4ab2ed7..2243353fe55 100644
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -46,7 +46,7 @@ my $firsttime = 100;
 my $count = 0;
 while (<>) {
 	my $line = $_;
-	if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z\_]+)\+/) {
+	if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z0-9\_]+)\+/) {
 		my $func = $2;
 		if ($done == 0) {
 			$start{$func} = $1;
@@ -66,7 +66,7 @@ while (<>) {
 		$count = $count + 1;
 	}
 
-	if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z\_]+)\+.*returned/) {
+	if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
 		if ($done == 0) {
 			$end{$2} = $1;
 			$maxtime = $1;
@@ -81,8 +81,8 @@ while (<>) {
 }
 
 if ($count == 0) {
-	print "No data found in the dmesg. Make sure CONFIG_PRINTK_TIME is enabled and\n";
-	print "that initcall_debug is passed on the kernel command line.\n\n";
+	print "No data found in the dmesg. Make sure that 'printk.time=1' and\n";
+	print "'initcall_debug' are passed on the kernel command line.\n\n";
 	print "Usage: \n";
 	print "      dmesg | perl scripts/bootgraph.pl > output.svg\n\n";
 	exit;