From 5a2a02b6347586ac40774c82477b20d2e6ba77df Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jul 2020 14:39:54 +0200 Subject: [PATCH] Revert "ANDROID: Disable wq fp check in CFI builds" This reverts commit fc33a8fd5430ac22d40696e74b1ea734c1782471 as CFI is being removed from the tree to come back later as a "clean" set of patches. Bug: 145210207 Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: Ie2c41854aa7613c7466dda6e88b3ce4b48460b80 --- kernel/workqueue.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index b98c60286bc1..c41c3c17b86a 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1624,9 +1624,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, struct work_struct *work = &dwork->work; WARN_ON_ONCE(!wq); -#ifndef CONFIG_CFI_CLANG WARN_ON_ONCE(timer->function != delayed_work_timer_fn); -#endif WARN_ON_ONCE(timer_pending(timer)); WARN_ON_ONCE(!list_empty(&work->entry));