x86: remove DEBUG_SIG (a7113170) · Commits · e / devices / android_kernel_fairphone_FP4

arch/x86/kernel/signal_32.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@
		#include <asm/vdso.h>
		#include "sigframe.h"

		#define DEBUG_SIG 0

		#define _BLOCKABLE (~(sigmask(SIGKILL) \| sigmask(SIGSTOP)))

		#define __FIX_EFLAGS (X86_EFLAGS_AC \| X86_EFLAGS_OF \| \
		@@ -412,11 +410,6 @@ static int setup_frame(int sig, struct k_sigaction *ka,
		if (test_thread_flag(TIF_SINGLESTEP))
		ptrace_notify(SIGTRAP);

		#if DEBUG_SIG
		printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%p\n",
		current->comm, current->pid, frame, regs->ip, frame->pretcode);
		#endif

		return 0;

		give_sigsegv:
		@@ -505,11 +498,6 @@ static int setup_rt_frame(int sig, struct k_sigaction ka, siginfo_t info,
		if (test_thread_flag(TIF_SINGLESTEP))
		ptrace_notify(SIGTRAP);

		#if DEBUG_SIG
		printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
		current->comm, current->pid, frame, regs->ip, frame->pretcode);
		#endif

		return 0;

		give_sigsegv:

arch/x86/kernel/signal_64.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@
		#include <asm/mce.h>
		#include "sigframe.h"

		#define DEBUG_SIG 0

		#define _BLOCKABLE (~(sigmask(SIGKILL) \| sigmask(SIGSTOP)))

		#define __FIX_EFLAGS (X86_EFLAGS_AC \| X86_EFLAGS_OF \| \
		@@ -142,10 +140,6 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
		if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
		goto badframe;

		#if DEBUG_SIG
		printk("%d sigreturn ip:%lx sp:%lx frame:%p ax:%lx\n",current->pid,regs->ip,regs->sp,frame,ax);
		#endif

		if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->sp) == -EFAULT)
		goto badframe;

		@@ -274,10 +268,6 @@ static int setup_rt_frame(int sig, struct k_sigaction ka, siginfo_t info,
		if (err)
		goto give_sigsegv;

		#if DEBUG_SIG
		printk("%d old ip %lx old sp %lx old ax %lx\n", current->pid,regs->ip,regs->sp,regs->ax);
		#endif

		/* Set up registers for signal handler */
		regs->di = sig;
		/* In case the signal handler was declared without prototypes */
		@@ -302,10 +292,6 @@ static int setup_rt_frame(int sig, struct k_sigaction ka, siginfo_t info,
		regs->flags &= ~(X86_EFLAGS_TF \| X86_EFLAGS_DF);
		if (test_thread_flag(TIF_SINGLESTEP))
		ptrace_notify(SIGTRAP);
		#if DEBUG_SIG
		printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%p\n",
		current->comm, current->pid, frame, regs->ip, frame->pretcode);
		#endif

		return 0;

		@@ -353,12 +339,6 @@ handle_signal(unsigned long sig, siginfo_t info, struct k_sigaction ka,
		{
		int ret;

		#if DEBUG_SIG
		printk("handle_signal pid:%d sig:%lu ip:%lx sp:%lx regs=%p\n",
		current->pid, sig,
		regs->ip, regs->sp, regs);
		#endif

		/* Are we from a system call? */
		if (current_syscall(regs) >= 0) {
		/* If so, check system call restarting.. */
		@@ -491,11 +471,6 @@ static void do_signal(struct pt_regs *regs)
		void do_notify_resume(struct pt_regs regs, void unused,
		__u32 thread_info_flags)
		{
		#if DEBUG_SIG
		printk("do_notify_resume flags:%x ip:%lx sp:%lx caller:%p pending:%x\n",
		thread_info_flags, regs->ip, regs->sp, __builtin_return_address(0),signal_pending(current));
		#endif

		/* Pending single-step? */
		if (thread_info_flags & _TIF_SINGLESTEP) {
		regs->flags \|= X86_EFLAGS_TF;