From 06a55d7a33e482ec5f4dec3b51ae572ef36f13aa Mon Sep 17 00:00:00 2001 From: Jan Moskyto Matejka Date: Thu, 22 May 2014 10:54:31 +1000 Subject: [PATCH] kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2 This commit fixes this warning: kernel/watchdog.c: In function `watchdog_timer_fn': kernel/watchdog.c:368:4: warning: `smp_mb__after_clear_bit' is deprecated (declared at include/linux/bitops.h:48) [-Wdeprecated-declarations] smp_mb__after_clear_bit(); That code was introduced in commit 90e6b763ca8a5eb739e59489f42d45e13431d157 ("kernel/watchdog.c: print traces for all cpus on lockup detection") and then merged with another branch containing commit febdbfe8a91ce0d11939d4940b592eb0dba8d663 ("arch: Prepare for smp_mb__{before,after}_atomic()") which deprecates the smp_mb__after_clear_bit() call in favour of smp_mb__after_atomic(). Signed-off-by: Jan Moskyto Matejka Acked-by: Aaron Tomlin Signed-off-by: Andrew Morton --- kernel/watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index bd77e97963a3..65f1adcade53 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -363,7 +363,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) clear_bit(0, &soft_lockup_nmi_warn); /* Barrier to sync with other cpus */ - smp_mb__after_clear_bit(); + smp_mb__after_atomic(); } if (softlockup_panic) -- 2.39.5