diff --git a/[refs] b/[refs] index d5d11502516a..5644ecce03ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e6f1b307e23201fb3e7aaf16322e80355d2a3d5 +refs/heads/master: ab4d2986e44c589aa1b647d7da5e21c2707babea diff --git a/trunk/kernel/srcu.c b/trunk/kernel/srcu.c index 3e43a214b4dc..7cf5baba96f9 100644 --- a/trunk/kernel/srcu.c +++ b/trunk/kernel/srcu.c @@ -282,12 +282,8 @@ static int srcu_readers_active(struct srcu_struct *sp) */ void cleanup_srcu_struct(struct srcu_struct *sp) { - int sum; - - sum = srcu_readers_active(sp); - WARN_ON(sum); /* Leakage unless caller handles error. */ - if (sum != 0) - return; + if (WARN_ON(srcu_readers_active(sp))) + return; /* Leakage unless caller handles error. */ free_percpu(sp->per_cpu_ref); sp->per_cpu_ref = NULL; }