tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

unicore32: Fix build error

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error: ‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error: ‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’
arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error: implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal()
signal_setup_done()").

This code never even compiled. Reverting the patch does not work, since
previously used functions no longer exist, so try to fix it up. Compile
tested only.

Fixes: 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()")
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Guenter Roeck and committed by
Linus Torvalds ca98565a 94559a4a

+5 -4
+5 -4
arch/unicore32/kernel/signal.c
··· 254 254 255 255 err |= setup_sigframe(frame, regs, set); 256 256 if (err == 0) 257 - err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig); 257 + err |= setup_return(regs, &ksig->ka, frame->retcode, frame, 258 + ksig->sig); 258 259 259 260 return err; 260 261 } ··· 277 276 err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp); 278 277 err |= setup_sigframe(&frame->sig, regs, set); 279 278 if (err == 0) 280 - err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig); 279 + err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, 280 + ksig->sig); 281 281 282 282 if (err == 0) { 283 283 /* ··· 305 303 int syscall) 306 304 { 307 305 struct thread_info *thread = current_thread_info(); 308 - struct task_struct *tsk = current; 309 306 sigset_t *oldset = sigmask_to_save(); 310 307 int usig = ksig->sig; 311 308 int ret; ··· 374 373 if (!user_mode(regs)) 375 374 return; 376 375 377 - if (get_signsl(&ksig)) { 376 + if (get_signal(&ksig)) { 378 377 handle_signal(&ksig, regs, syscall); 379 378 return; 380 379 }