12 lines
472 B
Diff
12 lines
472 B
Diff
--- ./fs/timerfd.c.orig 2015-11-09 15:37:56.000000000 -0700
|
|
+++ ./fs/timerfd.c 2015-11-14 08:20:51.720068530 -0700
|
|
@@ -134,7 +134,7 @@ static void timerfd_setup_cancel(struct
|
|
{
|
|
if ((ctx->clockid == CLOCK_REALTIME ||
|
|
ctx->clockid == CLOCK_REALTIME_ALARM) &&
|
|
- (flags & TFD_TIMER_ABSTIME) && (flags & TFD_TIMER_CANCEL_ON_SET)) {
|
|
+ (flags & TFD_TIMER_CANCEL_ON_SET)) {
|
|
if (!ctx->might_cancel) {
|
|
ctx->might_cancel = true;
|
|
spin_lock(&cancel_lock);
|