Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf77ee2a authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc: Remove ancient DEBUG_SIG code 



We have some compile-time disabled debug code in signal_xx.c. It's from
some ancient time BG, almost certainly part of the original port, given
the very similar code on other arches.

The show_unhandled_signal logic, added in d0c3d534 (2.6.24) is
cleaner and prints more useful information, so drop the debug code.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0eb57368

arch/powerpc/kernel/signal_32.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -54,7 +54,6 @@ 




#include "signal.h"

#include "signal.h"





#undef DEBUG_SIG





#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC64

#define sys_rt_sigreturn	compat_sys_rt_sigreturn

#define sys_rt_sigreturn	compat_sys_rt_sigreturn
@@ -1063,10 +1062,6 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka, 
	return 1;

	return 1;





badframe:

badframe:

#ifdef DEBUG_SIG

	printk("badframe in handle_rt_signal, regs=%p frame=%p newsp=%lx\n",

	       regs, frame, newsp);

#endif

	if (show_unhandled_signals)

	if (show_unhandled_signals)

		printk_ratelimited(KERN_INFO

		printk_ratelimited(KERN_INFO

				   "%s[%d]: bad frame in handle_rt_signal32: "

				   "%s[%d]: bad frame in handle_rt_signal32: "
@@ -1484,10 +1479,6 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka, 
	return 1;

	return 1;





badframe:

badframe:

#ifdef DEBUG_SIG

	printk("badframe in handle_signal, regs=%p frame=%p newsp=%lx\n",

	       regs, frame, newsp);

#endif

	if (show_unhandled_signals)

	if (show_unhandled_signals)

		printk_ratelimited(KERN_INFO

		printk_ratelimited(KERN_INFO

				   "%s[%d]: bad frame in handle_signal32: "

				   "%s[%d]: bad frame in handle_signal32: "

arch/powerpc/kernel/signal_64.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ 




#include "signal.h"

#include "signal.h"





#define DEBUG_SIG 0





#define GP_REGS_SIZE	min(sizeof(elf_gregset_t), sizeof(struct pt_regs))

#define GP_REGS_SIZE	min(sizeof(elf_gregset_t), sizeof(struct pt_regs))

#define FP_REGS_SIZE	sizeof(elf_fpregset_t)

#define FP_REGS_SIZE	sizeof(elf_fpregset_t)
@@ -700,10 +699,6 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5, 
	return 0;

	return 0;





badframe:

badframe:

#if DEBUG_SIG

	printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n",

	       regs, uc, &uc->uc_mcontext);

#endif

	if (show_unhandled_signals)

	if (show_unhandled_signals)

		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,

		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,

				   current->comm, current->pid, "rt_sigreturn",

				   current->comm, current->pid, "rt_sigreturn",
@@ -809,10 +804,6 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, 
	return 1;

	return 1;





badframe:

badframe:

#if DEBUG_SIG

	printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n",

	       regs, frame, newsp);

#endif

	if (show_unhandled_signals)

	if (show_unhandled_signals)

		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,

		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,

				   current->comm, current->pid, "setup_rt_frame",

				   current->comm, current->pid, "setup_rt_frame",