summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2008-07-25 01:45:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 10:53:27 -0700
commitabddaec56ebb7911bbf0578a4636a74bd7376d92 (patch)
treea77e40014e1d4edec7f1e5a226fedf46085f5f71
parent585e93ae83b80c874bf4eb50a239027cef5db4af (diff)
downloadlinux-stable-abddaec56ebb7911bbf0578a4636a74bd7376d92.tar.gz
linux-stable-abddaec56ebb7911bbf0578a4636a74bd7376d92.tar.bz2
linux-stable-abddaec56ebb7911bbf0578a4636a74bd7376d92.zip
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>
-rwxr-xr-xscripts/checkstack.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 358f96c75b43..3eca62566d6b 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -36,6 +36,7 @@ my (@stack, $re, $dre, $x, $xs);
my $arch = shift;
if ($arch eq "") {
$arch = `uname -m`;
+ chomp($arch);
}
$x = "[0-9a-f]"; # hex character
@@ -91,7 +92,7 @@ my (@stack, $re, $dre, $x, $xs);
# 0: 00 e8 38 01 LINK 0x4e0;
$re = qr/.*[[:space:]]LINK[[:space:]]*(0x$x{1,8})/o;
} else {
- print("wrong or unknown architecture\n");
+ print("wrong or unknown architecture \"$arch\"\n");
exit
}
}