ICS: implement rollback mechanics

rollback the EIP on return to user space if TIF_ROLLBACK_RCS is set

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index 65d7620eaa..e4ab40862b 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -27,6 +27,8 @@
 #include <asm/i387.h>
 #include "sigframe.h"
 
+#include <linux/ics.h>
+
 #define DEBUG_SIG 0
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
@@ -653,5 +655,12 @@ void do_notify_resume(struct pt_regs *regs, void *_unused,
         if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
                 do_signal(regs);
         
+        if (thread_info_flags & _TIF_ROLLBACK_RCS) {
+                long addr = (long) get_rollback_addr();
+                if (addr)
+                        regs->eip = addr;
+                clear_thread_flag(TIF_ROLLBACK_RCS);            
+        }
+
         clear_thread_flag(TIF_IRET);
 }