From: Jan Moskyto Matejka Date: Sat, 17 May 2014 13:19:22 +0000 (+1000) Subject: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2 X-Git-Tag: next-20140519~3^2~44 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3552f4121f3972d5b918d0889a9e299bc2d5a51;p=karo-tx-linux.git 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 --- 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)