diff --git a/[refs] b/[refs] index dcb65d62e6f0..7840391581cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2161db969313cb94ffd9377a525fb75c3fee9eeb +refs/heads/master: 5ecaafdbf44b1ba400b746c60c401d54c7ee0863 diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index c3340e836c37..ccec774c716d 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -94,6 +94,7 @@ static struct kprobe_blackpoint kprobe_blacklist[] = { {"native_get_debugreg",}, {"irq_entries_start",}, {"common_interrupt",}, + {"mcount",}, /* mcount can be called from everywhere */ {NULL} /* Terminator */ };