aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2008-07-25 04:45:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 13:53:27 -0400
commitabddaec56ebb7911bbf0578a4636a74bd7376d92 (patch)
treea77e40014e1d4edec7f1e5a226fedf46085f5f71
parent585e93ae83b80c874bf4eb50a239027cef5db4af (diff)
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);
36 my $arch = shift; 36 my $arch = shift;
37 if ($arch eq "") { 37 if ($arch eq "") {
38 $arch = `uname -m`; 38 $arch = `uname -m`;
39 chomp($arch);
39 } 40 }
40 41
41 $x = "[0-9a-f]"; # hex character 42 $x = "[0-9a-f]"; # hex character
@@ -91,7 +92,7 @@ my (@stack, $re, $dre, $x, $xs);
91 # 0: 00 e8 38 01 LINK 0x4e0; 92 # 0: 00 e8 38 01 LINK 0x4e0;
92 $re = qr/.*[[:space:]]LINK[[:space:]]*(0x$x{1,8})/o; 93 $re = qr/.*[[:space:]]LINK[[:space:]]*(0x$x{1,8})/o;
93 } else { 94 } else {
94 print("wrong or unknown architecture\n"); 95 print("wrong or unknown architecture \"$arch\"\n");
95 exit 96 exit
96 } 97 }
97} 98}