2 files changed, 6 insertions, 6 deletions

diff --git a/fs/exec.c b/fs/exec.c
index fd02ea4a81e9..b5bcf1aae0ab 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -632,10 +632,10 @@ static inline int de_thread(struct task_struct *tsk)
                  * synchronize with any firing (by calling del_timer_sync)
                  * before we can safely let the old group leader die.
                  */
-                sig->real_timer.data = (unsigned long)current;
+                sig->real_timer.data = current;
                 spin_unlock_irq(lock);
-                if (del_timer_sync(&sig->real_timer))
-                        add_timer(&sig->real_timer);
+                if (hrtimer_cancel(&sig->real_timer))
+                        hrtimer_restart(&sig->real_timer);
                 spin_lock_irq(lock);
         }
         while (atomic_read(&sig->count) > count) {
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 5e9251f65317..7eb1bd7f800c 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -330,7 +330,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
         unsigned long  min_flt = 0,  maj_flt = 0;
         cputime_t cutime, cstime, utime, stime;
         unsigned long rsslim = 0;
-        unsigned long it_real_value = 0;
+        DEFINE_KTIME(it_real_value);
         struct task_struct *t;
         char tcomm[sizeof(task->comm)];
 
@@ -386,7 +386,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
                         utime = cputime_add(utime, task->signal->utime);
                         stime = cputime_add(stime, task->signal->stime);
                 }
-                it_real_value = task->signal->it_real_value;
+                it_real_value = task->signal->real_timer.expires;
         }
         ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0;
         read_unlock(&tasklist_lock);
@@ -435,7 +435,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
                 priority,
                 nice,
                 num_threads,
-                jiffies_to_clock_t(it_real_value),
+                (long) ktime_to_clock_t(it_real_value),
                 start_time,
                 vsize,
                 mm ? get_mm_rss(mm) : 0,