diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 51c8e7f02f48b65955b94118d42610515eb3126d..f9ec6cbe77d365f37c76768e157c046db48f2b1f 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -252,7 +252,7 @@ struct rcu_torture_ops { void (*exp_sync)(void); unsigned long (*get_state)(void); void (*cond_sync)(unsigned long oldstate); - void (*call)(struct rcu_head *head, void (*func)(struct rcu_head *rcu)); + call_rcu_func_t call; void (*cb_barrier)(void); void (*fqs)(void); void (*stats)(void); diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h index ad11529375cce82b7184b08962d68ddd2040eee2..0c33c82cec643ddba18dc2894f034c7af48aaad6 100644 --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h @@ -464,8 +464,7 @@ struct rcu_state { /* shut bogus gcc warning) */ u8 flavor_mask; /* bit in flavor mask. */ struct rcu_data __percpu *rda; /* pointer of percu rcu_data. */ - void (*call)(struct rcu_head *head, /* call_rcu() flavor. */ - void (*func)(struct rcu_head *head)); + call_rcu_func_t call; /* call_rcu() flavor. */ /* The following fields are guarded by the root rcu_node's lock. */