From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752076AbaEBM4Y (ORCPT ); Fri, 2 May 2014 08:56:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52785 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751505AbaEBM4X (ORCPT ); Fri, 2 May 2014 08:56:23 -0400 From: Jan Moskyto Matejka To: Andrew Morton , Aaron Tomlin , linux-kernel@vger.kernel.org Cc: Jan Moskyto Matejka Subject: [PATCH] [linux-next] watchdog: convert deprecated call to current interface Date: Fri, 2 May 2014 14:56:14 +0200 Message-Id: <1399035374-13548-1-git-send-email-mq@suse.cz> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- kernel/watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 4dbc7f8..d977f51 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -365,7 +365,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) { -- 1.8.4.5