diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-02-01 16:37:23 -0500 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-02-01 16:37:23 -0500 |
commit | a12d3280df459c0f96ea153879c83ad1c331e6e7 (patch) | |
tree | 16ca67ea7d6a56699c49a97c82a41c7ddc31fb0d /arch | |
parent | d4e4eef5196379133b184781ab64e7e6af3363e1 (diff) |
rip out ics
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/signal.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c index 74155183bd..e95d73263e 100644 --- a/arch/i386/kernel/signal.c +++ b/arch/i386/kernel/signal.c | |||
@@ -27,8 +27,6 @@ | |||
27 | #include <asm/i387.h> | 27 | #include <asm/i387.h> |
28 | #include "sigframe.h" | 28 | #include "sigframe.h" |
29 | 29 | ||
30 | #include <linux/ics.h> | ||
31 | |||
32 | #define DEBUG_SIG 0 | 30 | #define DEBUG_SIG 0 |
33 | 31 | ||
34 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | 32 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) |
@@ -653,18 +651,6 @@ void do_notify_resume(struct pt_regs *regs, void *_unused, | |||
653 | 651 | ||
654 | /* deal with pending signal delivery */ | 652 | /* deal with pending signal delivery */ |
655 | if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) | 653 | if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) |
656 | do_signal(regs); | 654 | do_signal(regs); |
657 | |||
658 | if (thread_info_flags & _TIF_ROLLBACK_RCS) { | ||
659 | long addr = (long) get_rollback_addr(); | ||
660 | if (addr) { | ||
661 | ICS_DBG(KERN_DEBUG "do_notify_resume(): eip 0x%lx -> " | ||
662 | "0x%lx\n", regs->eip, addr); | ||
663 | regs->eip = addr; | ||
664 | |||
665 | } | ||
666 | clear_thread_flag(TIF_ROLLBACK_RCS); | ||
667 | } | ||
668 | |||
669 | clear_thread_flag(TIF_IRET); | 655 | clear_thread_flag(TIF_IRET); |
670 | } | 656 | } |