Merge remote-tracking branch 'drm-intel/topic/core-for-CI' into drm-tip

1 files changed, 8 insertions, 1 deletions

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 85f1021ad459..600b3ddbdf08 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -617,7 +617,14 @@ static const struct debug_obj_descr timer_debug_descr;
 
 static void *timer_debug_hint(void *addr)
 {
-	return ((struct timer_list *) addr)->function;
+	struct timer_list *timer = addr;
+
+	if (timer->function == delayed_work_timer_fn) {
+		struct delayed_work *work = from_timer(work, timer, timer);
+		return work->work.func;
+	}
+
+	return timer->function;
 }
 
 static bool timer_is_static_object(void *addr)