rcu: Use bitwise instead of arithmetic operator for flags

This silences the following coccinelle warning:
  WARNING: sum of probable bitmasks, consider |

Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
Reviewed-by: "Paul E. McKenney" <paulmck@kernel.org>
Signed-off-by: Neeraj Upadhyay <neeraj.upadhyay@kernel.org>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>

diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 1c7cbd145d5e3766c1cfd67e99ffb8a69ce8adc5..3927ea5f7955c0838359c9cc2fde7515b4d7113c 100644 (file)
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -183,9 +183,9 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp)
        switch (blkd_state) {
        case 0:
        case                RCU_EXP_TASKS:
-       case                RCU_EXP_TASKS + RCU_GP_BLKD:
+       case                RCU_EXP_TASKS | RCU_GP_BLKD:
        case RCU_GP_TASKS:
-       case RCU_GP_TASKS + RCU_EXP_TASKS:
+       case RCU_GP_TASKS | RCU_EXP_TASKS:
 
                /*
                 * Blocking neither GP, or first task blocking the normal
@@ -198,10 +198,10 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp)
 
        case                                              RCU_EXP_BLKD:
        case                                RCU_GP_BLKD:
-       case                                RCU_GP_BLKD + RCU_EXP_BLKD:
-       case RCU_GP_TASKS +                               RCU_EXP_BLKD:
-       case RCU_GP_TASKS +                 RCU_GP_BLKD + RCU_EXP_BLKD:
-       case RCU_GP_TASKS + RCU_EXP_TASKS + RCU_GP_BLKD + RCU_EXP_BLKD:
+       case                                RCU_GP_BLKD | RCU_EXP_BLKD:
+       case RCU_GP_TASKS |                               RCU_EXP_BLKD:
+       case RCU_GP_TASKS |                 RCU_GP_BLKD | RCU_EXP_BLKD:
+       case RCU_GP_TASKS | RCU_EXP_TASKS | RCU_GP_BLKD | RCU_EXP_BLKD:
 
                /*
                 * First task arriving that blocks either GP, or first task
@@ -214,9 +214,9 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp)
                list_add_tail(&t->rcu_node_entry, &rnp->blkd_tasks);
                break;
 
-       case                RCU_EXP_TASKS +               RCU_EXP_BLKD:
-       case                RCU_EXP_TASKS + RCU_GP_BLKD + RCU_EXP_BLKD:
-       case RCU_GP_TASKS + RCU_EXP_TASKS +               RCU_EXP_BLKD:
+       case                RCU_EXP_TASKS |               RCU_EXP_BLKD:
+       case                RCU_EXP_TASKS | RCU_GP_BLKD | RCU_EXP_BLKD:
+       case RCU_GP_TASKS | RCU_EXP_TASKS |               RCU_EXP_BLKD:
 
                /*
                 * Second or subsequent task blocking the expedited GP.
@@ -227,8 +227,8 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp)
                list_add(&t->rcu_node_entry, rnp->exp_tasks);
                break;
 
-       case RCU_GP_TASKS +                 RCU_GP_BLKD:
-       case RCU_GP_TASKS + RCU_EXP_TASKS + RCU_GP_BLKD:
+       case RCU_GP_TASKS |                 RCU_GP_BLKD:
+       case RCU_GP_TASKS | RCU_EXP_TASKS | RCU_GP_BLKD:
 
                /*
                 * Second or subsequent task blocking the normal GP.