[PATCH] [linux-next] watchdog: convert deprecated call to current interface

[PATCH] [linux-next] watchdog: convert deprecated call to current interface

[Jan Moskyto Matejka]

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 <mq@suse.cz>
---
 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

Re: [PATCH] [linux-next] watchdog: convert deprecated call to current interface

[Aaron Tomlin]

On Fri, May 02, 2014 at 02:56:14PM +0200, Jan Moskyto Matejka wrote:
> 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 <mq@suse.cz>
> ---
>  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

Acked-by: Aaron Tomlin <atomlin@redhat.com>

-- 
Aaron Tomlin