Merge branch 'linus' into perf/urgent

Merge reason: Fix upstream breakage introduced by:

 de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
index 38729d3cd236..196ec02f8be0 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -169,6 +169,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
         while (list) {
                 next = list->next;
                 prefetch(next);
+                debug_rcu_head_unqueue(list);
                 list->func(list);
                 list = next;
         }
@@ -211,6 +212,7 @@ static void __call_rcu(struct rcu_head *head,
 {
         unsigned long flags;
 
+        debug_rcu_head_queue(head);
         head->func = func;
         head->next = NULL;