struct rcu_synchronize {
        struct rcu_head head;
        struct completion completion;
+
+       /* This is for debugging. */
+       struct rcu_gp_oldstate oldstate;
 };
 void wakeme_after_rcu(struct rcu_head *head);
 
 
 {
        struct rcu_synchronize *rs = container_of(
                (struct rcu_head *) node, struct rcu_synchronize, head);
-       unsigned long oldstate = (unsigned long) rs->head.func;
 
        WARN_ONCE(IS_ENABLED(CONFIG_PROVE_RCU) &&
-               !poll_state_synchronize_rcu(oldstate),
-               "A full grace period is not passed yet: %lu",
-               rcu_seq_diff(get_state_synchronize_rcu(), oldstate));
+               !poll_state_synchronize_rcu_full(&rs->oldstate),
+               "A full grace period is not passed yet!\n");
 
        /* Finally. */
        complete(&rs->completion);
         * snapshot before adding a request.
         */
        if (IS_ENABLED(CONFIG_PROVE_RCU))
-               rs.head.func = (void *) get_state_synchronize_rcu();
+               get_state_synchronize_rcu_full(&rs.oldstate);
 
        rcu_sr_normal_add_req(&rs);