Skip to contentSkip to conversation

xtensa: fix build failure in xtensa/kernel/signal.c

PATCH In review Paul Gortmaker 2 participants 4 messages Apr 18, 2012 – Apr 19, 2012 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore

Paul Gortmaker

author
#0 lore raw

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

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 <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Chris Zankel <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>
arch/xtensa/kernel/signal.c +1 -0
index b69b000..d78869a 100644
@@ -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? */
Signature · 1 line
1.7.9.1
#1 lore raw
Quoted 17 lines · 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 <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Chris Zankel <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>
arch/xtensa/kernel/signal.c +0 -0
index b69b000..d78869a 100644

arch/xtensa/kernel/signal.c int do_signal(struct pt_regs *regs, sigset_t *oldset) · line 502

Quoted 7 lines
arch/xtensa/kernel/signal.c +1 -0
@@ -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.

author
#2 lore raw
Quoted 23 lines · Matt Fleming
Quoted 22 lines · 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 <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Chris Zankel <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>
arch/xtensa/kernel/signal.c +1 -0
index b69b000..d78869a 100644
@@ -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;
Quoted 8 lines

arch/xtensa/kernel/signal.c int do_signal(struct pt_regs *regs, sigset_t *oldset) · line 502

Quoted 2 lines
arch/xtensa/kernel/signal.c +0 -0
 		/* 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.

Quoted 1 line
#3 lore raw
Quoted 30 lines · Paul Gortmaker
Quoted 29 lines · Matt Fleming
Quoted 17 lines · 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 <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Chris Zankel <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>
arch/xtensa/kernel/signal.c +0 -0
index b69b000..d78869a 100644

arch/xtensa/kernel/signal.c int do_signal(struct pt_regs *regs, sigset_t *oldset) · line 502

Quoted 7 lines
arch/xtensa/kernel/signal.c +1 -0
@@ -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.

Quoted 8 lines
Quoted 2 lines

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.