X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=fs%2Ftimerfd.c;h=48305ba41e3c75d1a1b2cce8d9baa92a9d3cc259;hb=32b90daf5cafdda62b1ce62d0b7445fa9107babf;hp=6a6fc8aa1de78381ae770c976d29274445a05ded;hpb=c3bdd5e65185f46150b3bac103b3854040487857;p=linux.git

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 6a6fc8aa1de7..48305ba41e3c 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -471,7 +471,11 @@ static int do_timerfd_settime(int ufd, int flags,
 				break;
 		}
 		spin_unlock_irq(&ctx->wqh.lock);
-		cpu_relax();
+
+		if (isalarm(ctx))
+			hrtimer_cancel_wait_running(&ctx->t.alarm.timer);
+		else
+			hrtimer_cancel_wait_running(&ctx->t.tmr);
 	}
 
 	/*