Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

This commit is contained in:
David S. Miller 2015-11-01 00:15:30 -04:00
commit b75ec3af27
201 changed files with 1364 additions and 793 deletions

View file

@ -85,9 +85,19 @@ check_stack(unsigned long ip, unsigned long *stack)
if (!object_is_on_stack(stack))
return;
/* Can't do this from NMI context (can cause deadlocks) */
if (in_nmi())
return;
local_irq_save(flags);
arch_spin_lock(&max_stack_lock);
/*
* RCU may not be watching, make it see us.
* The stack trace code uses rcu_sched.
*/
rcu_irq_enter();
/* In case another CPU set the tracer_frame on us */
if (unlikely(!frame_size))
this_size -= tracer_frame;
@ -169,6 +179,7 @@ check_stack(unsigned long ip, unsigned long *stack)
}
out:
rcu_irq_exit();
arch_spin_unlock(&max_stack_lock);
local_irq_restore(flags);
}