diff --git a/[refs] b/[refs] index 69640572c461..301c7a4a4310 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ed42b8113667c06a6ff2c72717395b5044d30a1 +refs/heads/master: cc5b83a9f884fe8722a275069a5a6fde39988455 diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 0c30d0455de1..681bc2e1e187 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -3822,6 +3822,7 @@ void lockdep_rcu_dereference(const char *file, const int line) printk("%s:%d invoked rcu_dereference_check() without protection!\n", file, line); printk("\nother info that might help us debug this:\n\n"); + printk("\nrcu_scheduler_active = %d, debug_locks = %d\n", rcu_scheduler_active, debug_locks); lockdep_print_held_locks(curr); printk("\nstack backtrace:\n"); dump_stack();