From c5d2219efd8df80fba9ab557e45a845c2b54e5bf Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Thu, 2 Apr 2020 13:56:04 -0700 Subject: [PATCH] ANDROID: Fix wq fp check for CFI builds A previous change added a test on the wrong config flag; rename CFI to CFI_CLANG. Bug: 145210207 Change-Id: Id8aead2eb2c75ad6442d10165f6cb86ccfb9c2f9 Signed-off-by: Alistair Delva --- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index c6bd56031d25..863d53901660 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1532,7 +1532,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 +#ifndef CONFIG_CFI_CLANG WARN_ON_ONCE(timer->function != delayed_work_timer_fn); #endif WARN_ON_ONCE(timer->data != (unsigned long)dwork);