[PATCH] xtensa: fix build failure in xtensa/kernel/signal.c

[PATCH] xtensa: fix build failure in xtensa/kernel/signal.c

[Paul Gortmaker]

Caused by commit 3785006ac3c8941feb63097c416de92114a6bc39

    "xtensa: don't mask signals if we fail to setup signal stack"

It assigns a return value to "ret", but there is no such variable
anywhere in scope.  Create one.

Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index b69b000..d78869a 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -496,6 +496,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
 
 	if (signr > 0) {
+		int ret;
 
 		/* Are we from a system call? */
 
-- 
1.7.9.1

Re: [PATCH] xtensa: fix build failure in xtensa/kernel/signal.c

[Matt Fleming]

On Wed, 2012-04-18 at 16:50 -0400, Paul Gortmaker wrote:
> Caused by commit 3785006ac3c8941feb63097c416de92114a6bc39
> 
>     "xtensa: don't mask signals if we fail to setup signal stack"
> 
> It assigns a return value to "ret", but there is no such variable
> anywhere in scope.  Create one.
> 
> Cc: Matt Fleming <matt.fleming@intel.com>
> Cc: Oleg Nesterov <oleg@redhat.com>
> Cc: Chris Zankel <chris@zankel.net>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
> index b69b000..d78869a 100644
> --- a/arch/xtensa/kernel/signal.c
> +++ b/arch/xtensa/kernel/signal.c
> @@ -496,6 +496,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
>  	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
>  
>  	if (signr > 0) {
> +		int ret;
>  
>  		/* Are we from a system call? */
>  

Whoops! Thanks Paul, that's my bad. Looks like I went code-blind after
making the same kinds of changes to lots of different architectures.

I've added Andrew to the Cc list since he picked up the last set of
xtensa signal patches.

Re: [PATCH] xtensa: fix build failure in xtensa/kernel/signal.c

[Paul Gortmaker]

On 12-04-19 03:45 AM, Matt Fleming wrote:
> On Wed, 2012-04-18 at 16:50 -0400, Paul Gortmaker wrote:
>> Caused by commit 3785006ac3c8941feb63097c416de92114a6bc39
>>
>>     "xtensa: don't mask signals if we fail to setup signal stack"
>>
>> It assigns a return value to "ret", but there is no such variable
>> anywhere in scope.  Create one.
>>
>> Cc: Matt Fleming <matt.fleming@intel.com>
>> Cc: Oleg Nesterov <oleg@redhat.com>
>> Cc: Chris Zankel <chris@zankel.net>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>>
>> diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
>> index b69b000..d78869a 100644
>> --- a/arch/xtensa/kernel/signal.c
>> +++ b/arch/xtensa/kernel/signal.c
>> @@ -496,6 +496,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
>>  	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
>>  
>>  	if (signr > 0) {
>> +		int ret;
>>  
>>  		/* Are we from a system call? */
>>  
> 
> Whoops! Thanks Paul, that's my bad. Looks like I went code-blind after
> making the same kinds of changes to lots of different architectures.
> 
> I've added Andrew to the Cc list since he picked up the last set of
> xtensa signal patches.

Looks like I'll have a queue of build fixes from various other less
common architectures, so I can carry this one in my for-3.4 queue
(since 3785006a is already in master).

I'll add an acked-by from you.

Paul.

> 

Re: [PATCH] xtensa: fix build failure in xtensa/kernel/signal.c

[Matt Fleming]

On Thu, 2012-04-19 at 08:46 -0400, Paul Gortmaker wrote:
> On 12-04-19 03:45 AM, Matt Fleming wrote:
> > On Wed, 2012-04-18 at 16:50 -0400, Paul Gortmaker wrote:
> >> Caused by commit 3785006ac3c8941feb63097c416de92114a6bc39
> >>
> >>     "xtensa: don't mask signals if we fail to setup signal stack"
> >>
> >> It assigns a return value to "ret", but there is no such variable
> >> anywhere in scope.  Create one.
> >>
> >> Cc: Matt Fleming <matt.fleming@intel.com>
> >> Cc: Oleg Nesterov <oleg@redhat.com>
> >> Cc: Chris Zankel <chris@zankel.net>
> >> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> >>
> >> diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
> >> index b69b000..d78869a 100644
> >> --- a/arch/xtensa/kernel/signal.c
> >> +++ b/arch/xtensa/kernel/signal.c
> >> @@ -496,6 +496,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
> >>  	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
> >>  
> >>  	if (signr > 0) {
> >> +		int ret;
> >>  
> >>  		/* Are we from a system call? */
> >>  
> > 
> > Whoops! Thanks Paul, that's my bad. Looks like I went code-blind after
> > making the same kinds of changes to lots of different architectures.
> > 
> > I've added Andrew to the Cc list since he picked up the last set of
> > xtensa signal patches.
> 
> Looks like I'll have a queue of build fixes from various other less
> common architectures, so I can carry this one in my for-3.4 queue
> (since 3785006a is already in master).
> 
> I'll add an acked-by from you.

Sure, that's fine by me.