1 files changed, 8 insertions, 7 deletions

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 55b3761edaa9..57efe0400bc2 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -547,9 +547,9 @@ sys_timer_create(const clockid_t which_clock,
                                 new_timer->it_process = process;
                                 list_add(&new_timer->list,
                                          &process->signal->posix_timers);
-                                spin_unlock_irqrestore(&process->sighand->siglock, flags);
                                 if (new_timer->it_sigev_notify == (SIGEV_SIGNAL|SIGEV_THREAD_ID))
                                         get_task_struct(process);
+                                spin_unlock_irqrestore(&process->sighand->siglock, flags);
                         } else {
                                 spin_unlock_irqrestore(&process->sighand->siglock, flags);
                                 process = NULL;
@@ -605,13 +605,14 @@ static struct k_itimer * lock_timer(timer_t timer_id, unsigned long *flags)
         timr = (struct k_itimer *) idr_find(&posix_timers_id, (int) timer_id);
         if (timr) {
                 spin_lock(&timr->it_lock);
-                spin_unlock(&idr_lock);
 
                 if ((timr->it_id != timer_id) || !(timr->it_process) ||
                                 timr->it_process->tgid != current->tgid) {
-                        unlock_timer(timr, *flags);
+                        spin_unlock(&timr->it_lock);
+                        spin_unlock_irqrestore(&idr_lock, *flags);
                         timr = NULL;
-                }
+                } else
+                        spin_unlock(&idr_lock);
         } else
                 spin_unlock_irqrestore(&idr_lock, *flags);
 
@@ -711,7 +712,7 @@ sys_timer_getoverrun(timer_t timer_id)
 {
         struct k_itimer *timr;
         int overrun;
-        long flags;
+        unsigned long flags;
 
         timr = lock_timer(timer_id, &flags);
         if (!timr)
@@ -783,7 +784,7 @@ sys_timer_settime(timer_t timer_id, int flags,
         struct k_itimer *timr;
         struct itimerspec new_spec, old_spec;
         int error = 0;
-        long flag;
+        unsigned long flag;
         struct itimerspec *rtn = old_setting ? &old_spec : NULL;
 
         if (!new_setting)
@@ -835,7 +836,7 @@ asmlinkage long
 sys_timer_delete(timer_t timer_id)
 {
         struct k_itimer *timer;
-        long flags;
+        unsigned long flags;
 
 retry_delete:
         timer = lock_timer(timer_id, &flags);