X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Ftimerfd.c;h=e9c96a0c79f113f8c49f09bd7c8ea90c2f2677a3;hb=44d7d3b0d1cdb2119dba33bbedd602ce30528d6c;hp=c5509d2448e386f9869bf15169e211ee2744b703;hpb=e4c429c4ad696cdefc3fcf9f7c6a549ec72ab50d;p=linux-2.6-microblaze.git

diff --git a/fs/timerfd.c b/fs/timerfd.c
index c5509d2448e3..e9c96a0c79f1 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -115,6 +115,22 @@ void timerfd_clock_was_set(void)
 	rcu_read_unlock();
 }
 
+static void timerfd_resume_work(struct work_struct *work)
+{
+	timerfd_clock_was_set();
+}
+
+static DECLARE_WORK(timerfd_work, timerfd_resume_work);
+
+/*
+ * Invoked from timekeeping_resume(). Defer the actual update to work so
+ * timerfd_clock_was_set() runs in task context.
+ */
+void timerfd_resume(void)
+{
+	schedule_work(&timerfd_work);
+}
+
 static void __timerfd_remove_cancel(struct timerfd_ctx *ctx)
 {
 	if (ctx->might_cancel) {