Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / kernel / time / posix-timers.c

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 7363f81..1cd10b1 100644 (file)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -336,7 +336,7 @@ void posixtimer_rearm(struct kernel_siginfo *info)
 int posix_timer_event(struct k_itimer *timr, int si_private)
 {
        enum pid_type type;
-       int ret = -1;
+       int ret;
        /*
         * FIXME: if ->sigq is queued we can race with
         * dequeue_signal()->posixtimer_rearm().