[PATCH] fix checkstack.pl arch detection

[PATCH] fix checkstack.pl arch detection

[Eric Sandeen]

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>
---

Index: linux-2.6.25/scripts/checkstack.pl
===================================================================
--- linux-2.6.25.orig/scripts/checkstack.pl	2008-05-02 12:17:59.000000000 -0500
+++ linux-2.6.25/scripts/checkstack.pl	2008-05-02 12:18:15.426407528 -0500
@@ -32,6 +32,7 @@ my (@stack, $re, $x, $xs);
 	my $arch = shift;
 	if ($arch eq "") {
 		$arch = `uname -m`;
+		chomp($arch);
 	}
 
 	$x	= "[0-9a-f]";	# hex character
@@ -85,7 +86,7 @@ my (@stack, $re, $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
 	}
 }

Re: [PATCH] fix checkstack.pl arch detection

[Jörn Engel]

On Fri, 2 May 2008 12:20:53 -0500, Eric Sandeen wrote:
> 
> 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>
Reviewed-By: Joern Engel <joern@logfs.org>

Jörn

-- 
Premature optimization is the root of all evil.
-- Donald Knuth

Re: [PATCH] fix checkstack.pl arch detection

[Andrew Morton]

On Sat, 3 May 2008 00:37:03 +0200
J__rn Engel <joern@logfs.org> wrote:

> On Fri, 2 May 2008 12:20:53 -0500, Eric Sandeen wrote:
> > 
> > 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>
> Reviewed-By: Joern Engel <joern@logfs.org>
> 

please cc apw on checkpatch changes.

This patch needs some help to merge against the forthcoming
checkpatch-0.19.  I sent your patches apw-wards.

Re: [PATCH] fix checkstack.pl arch detection

[Eric Sandeen]

Andrew Morton wrote:
> On Sat, 3 May 2008 00:37:03 +0200
> J__rn Engel <joern@logfs.org> wrote:
> 
>> On Fri, 2 May 2008 12:20:53 -0500, Eric Sandeen wrote:
>>> 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>
>> Reviewed-By: Joern Engel <joern@logfs.org>
>>
> 
> please cc apw on checkpatch changes.
> 
> This patch needs some help to merge against the forthcoming
> checkpatch-0.19.  I sent your patches apw-wards.
> 

Um, checkpatch or checkstack? :)

-Eric

Re: [PATCH] fix checkstack.pl arch detection

[Andrew Morton]

On Fri, 02 May 2008 21:20:48 -0500 Eric Sandeen <sandeen@redhat.com> wrote:

> Andrew Morton wrote:
> > On Sat, 3 May 2008 00:37:03 +0200
> > J__rn Engel <joern@logfs.org> wrote:
> > 
> >> On Fri, 2 May 2008 12:20:53 -0500, Eric Sandeen wrote:
> >>> 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>
> >> Reviewed-By: Joern Engel <joern@logfs.org>
> >>
> > 
> > please cc apw on checkpatch changes.
> > 
> > This patch needs some help to merge against the forthcoming
> > checkpatch-0.19.  I sent your patches apw-wards.
> > 
> 
> Um, checkpatch or checkstack? :)
> 

bah.

hm, I wonder why one of them got a reject.  `patch -l' was needed.  Mailer
munchies, perhaps?

Please check that what I applied is still correct.

Re: [PATCH] fix checkstack.pl arch detection

[Eric Sandeen]

Andrew Morton wrote:

>>> please cc apw on checkpatch changes.
>>>
>>> This patch needs some help to merge against the forthcoming
>>> checkpatch-0.19.  I sent your patches apw-wards.
>>>
>> Um, checkpatch or checkstack? :)
>>
> 
> bah.
> 
> hm, I wonder why one of them got a reject.  `patch -l' was needed.  Mailer
> munchies, perhaps?
> 
> Please check that what I applied is still correct.

They look fine... sorry, didn't generate against -mm but didn't expect
differences.  I'll update an -mm tree and give it a functional check too...

Thanks Andrew,

-Eric

Re: [PATCH] fix checkstack.pl arch detection

[Andrew Morton]

On Fri, 02 May 2008 21:40:23 -0500 Eric Sandeen <sandeen@redhat.com> wrote:

> Andrew Morton wrote:
> 
> >>> please cc apw on checkpatch changes.
> >>>
> >>> This patch needs some help to merge against the forthcoming
> >>> checkpatch-0.19.  I sent your patches apw-wards.
> >>>
> >> Um, checkpatch or checkstack? :)
> >>
> > 
> > bah.
> > 
> > hm, I wonder why one of them got a reject.  `patch -l' was needed.  Mailer
> > munchies, perhaps?
> > 
> > Please check that what I applied is still correct.
> 
> They look fine... sorry, didn't generate against -mm but didn't expect
> differences.  I'll update an -mm tree and give it a functional check too...
> 

There are no changes since 2.6.25.

"find dynamic stack allocations in checkstack.pl" just doesn't apply.  Hunk
1 assumes that "fix checkstack.pl arch detection" is present, but when "fix
checkstack.pl arch detection" is applied, hunks 1 and 2 don't apply.