Explorar o código

fix checkstack.pl arch detection

uname -m was leaving a newline in $arch, and not passing the tests.

Also, printing the unknown arch on failure is probably helpful.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Eric Sandeen %!s(int64=17) %!d(string=hai) anos
pai
achega
abddaec56e
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      scripts/checkstack.pl

+ 2 - 1
scripts/checkstack.pl

@@ -36,6 +36,7 @@ my (@stack, $re, $dre, $x, $xs);
 	my $arch = shift;
 	my $arch = shift;
 	if ($arch eq "") {
 	if ($arch eq "") {
 		$arch = `uname -m`;
 		$arch = `uname -m`;
+		chomp($arch);
 	}
 	}
 
 
 	$x	= "[0-9a-f]";	# hex character
 	$x	= "[0-9a-f]";	# hex character
@@ -91,7 +92,7 @@ my (@stack, $re, $dre, $x, $xs);
 		#   0:   00 e8 38 01     LINK 0x4e0;
 		#   0:   00 e8 38 01     LINK 0x4e0;
 		$re = qr/.*[[:space:]]LINK[[:space:]]*(0x$x{1,8})/o;
 		$re = qr/.*[[:space:]]LINK[[:space:]]*(0x$x{1,8})/o;
 	} else {
 	} else {
-		print("wrong or unknown architecture\n");
+		print("wrong or unknown architecture \"$arch\"\n");
 		exit
 		exit
 	}
 	}
 }
 }