aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-03-06 04:24:04 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:57 -0400
commita7113170214b569d24e413326a56c4cc5cc1a152 (patch)
treea1821afae04f9fabc3c2ca7cfbca9a778ffdf71c /arch/x86
parentc1db29dbc761e9a464b417df7d4dbbae7df81f4c (diff)
x86: remove DEBUG_SIG
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/signal_32.c12
-rw-r--r--arch/x86/kernel/signal_64.c25
2 files changed, 0 insertions, 37 deletions
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index add9c6e9c44..f4ec6a09295 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -26,8 +26,6 @@
26#include <asm/vdso.h> 26#include <asm/vdso.h>
27#include "sigframe.h" 27#include "sigframe.h"
28 28
29#define DEBUG_SIG 0
30
31#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) 29#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
32 30
33#define __FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_OF | \ 31#define __FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_OF | \
@@ -412,11 +410,6 @@ static int setup_frame(int sig, struct k_sigaction *ka,
412 if (test_thread_flag(TIF_SINGLESTEP)) 410 if (test_thread_flag(TIF_SINGLESTEP))
413 ptrace_notify(SIGTRAP); 411 ptrace_notify(SIGTRAP);
414 412
415#if DEBUG_SIG
416 printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%p\n",
417 current->comm, current->pid, frame, regs->ip, frame->pretcode);
418#endif
419
420 return 0; 413 return 0;
421 414
422give_sigsegv: 415give_sigsegv:
@@ -505,11 +498,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
505 if (test_thread_flag(TIF_SINGLESTEP)) 498 if (test_thread_flag(TIF_SINGLESTEP))
506 ptrace_notify(SIGTRAP); 499 ptrace_notify(SIGTRAP);
507 500
508#if DEBUG_SIG
509 printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
510 current->comm, current->pid, frame, regs->ip, frame->pretcode);
511#endif
512
513 return 0; 501 return 0;
514 502
515give_sigsegv: 503give_sigsegv:
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 043294582f4..827179c5b32 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -28,8 +28,6 @@
28#include <asm/mce.h> 28#include <asm/mce.h>
29#include "sigframe.h" 29#include "sigframe.h"
30 30
31#define DEBUG_SIG 0
32
33#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) 31#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
34 32
35#define __FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_OF | \ 33#define __FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_OF | \
@@ -142,10 +140,6 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
142 if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax)) 140 if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
143 goto badframe; 141 goto badframe;
144 142
145#if DEBUG_SIG
146 printk("%d sigreturn ip:%lx sp:%lx frame:%p ax:%lx\n",current->pid,regs->ip,regs->sp,frame,ax);
147#endif
148
149 if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->sp) == -EFAULT) 143 if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->sp) == -EFAULT)
150 goto badframe; 144 goto badframe;
151 145
@@ -274,10 +268,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
274 if (err) 268 if (err)
275 goto give_sigsegv; 269 goto give_sigsegv;
276 270
277#if DEBUG_SIG
278 printk("%d old ip %lx old sp %lx old ax %lx\n", current->pid,regs->ip,regs->sp,regs->ax);
279#endif
280
281 /* Set up registers for signal handler */ 271 /* Set up registers for signal handler */
282 regs->di = sig; 272 regs->di = sig;
283 /* In case the signal handler was declared without prototypes */ 273 /* 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,
302 regs->flags &= ~(X86_EFLAGS_TF | X86_EFLAGS_DF); 292 regs->flags &= ~(X86_EFLAGS_TF | X86_EFLAGS_DF);
303 if (test_thread_flag(TIF_SINGLESTEP)) 293 if (test_thread_flag(TIF_SINGLESTEP))
304 ptrace_notify(SIGTRAP); 294 ptrace_notify(SIGTRAP);
305#if DEBUG_SIG
306 printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%p\n",
307 current->comm, current->pid, frame, regs->ip, frame->pretcode);
308#endif
309 295
310 return 0; 296 return 0;
311 297
@@ -353,12 +339,6 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
353{ 339{
354 int ret; 340 int ret;
355 341
356#if DEBUG_SIG
357 printk("handle_signal pid:%d sig:%lu ip:%lx sp:%lx regs=%p\n",
358 current->pid, sig,
359 regs->ip, regs->sp, regs);
360#endif
361
362 /* Are we from a system call? */ 342 /* Are we from a system call? */
363 if (current_syscall(regs) >= 0) { 343 if (current_syscall(regs) >= 0) {
364 /* If so, check system call restarting.. */ 344 /* If so, check system call restarting.. */
@@ -491,11 +471,6 @@ static void do_signal(struct pt_regs *regs)
491void do_notify_resume(struct pt_regs *regs, void *unused, 471void do_notify_resume(struct pt_regs *regs, void *unused,
492 __u32 thread_info_flags) 472 __u32 thread_info_flags)
493{ 473{
494#if DEBUG_SIG
495 printk("do_notify_resume flags:%x ip:%lx sp:%lx caller:%p pending:%x\n",
496 thread_info_flags, regs->ip, regs->sp, __builtin_return_address(0),signal_pending(current));
497#endif
498
499 /* Pending single-step? */ 474 /* Pending single-step? */
500 if (thread_info_flags & _TIF_SINGLESTEP) { 475 if (thread_info_flags & _TIF_SINGLESTEP) {
501 regs->flags |= X86_EFLAGS_TF; 476 regs->flags |= X86_EFLAGS_TF;