Messages in this thread Patch in this message | | | Date | Fri, 14 Oct 2011 18:07:14 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the final tree (sparc, ptrace trees related) |
| |
Hi All,
After merging the final tree, today's linux-next build (sparc64 defconfig) failed like this:
arch/sparc/kernel/signal_64.c: In function 'handle_signal': arch/sparc/kernel/signal_64.c:482:11: error: unused variable 'blocked' [-Werror=unused-variable]
Caused by my merge of commits faddf598f0ba ("sparc: Use set_current_blocked()") form the sparc tree and 383fe35697e4 ("sparc: Use set_current_blocked() and block_sigmask()") from the ptrace tree.
I have added the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 14 Oct 2011 17:58:53 +1100 Subject: [PATCH] sparc: fix mismerge of signal*.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/sparc/kernel/signal32.c | 1 - arch/sparc/kernel/signal_32.c | 1 - arch/sparc/kernel/signal_64.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c index 74a5dde..22b7c6a 100644 --- a/arch/sparc/kernel/signal32.c +++ b/arch/sparc/kernel/signal32.c @@ -776,7 +776,6 @@ static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset, struct pt_regs *regs) { - sigset_t blocked; int err; if (ka->sa.sa_flags & SA_SIGINFO) diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c index 9e005b6..b3a2229 100644 --- a/arch/sparc/kernel/signal_32.c +++ b/arch/sparc/kernel/signal_32.c @@ -465,7 +465,6 @@ static inline int handle_signal(unsigned long signr, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset, struct pt_regs *regs) { - sigset_t blocked; int err; if (ka->sa.sa_flags & SA_SIGINFO) diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c index 26560e9..27332cd 100644 --- a/arch/sparc/kernel/signal_64.c +++ b/arch/sparc/kernel/signal_64.c @@ -479,7 +479,6 @@ static inline int handle_signal(unsigned long signr, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset, struct pt_regs *regs) { - sigset_t blocked; int err; err = setup_rt_frame(ka, regs, signr, oldset, -- 1.7.7 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |