diff --git a/[refs] b/[refs] index 4245ec96196e..634833f586c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8222d718b3ad3ae49c48f69ae4b6a1128c9a92cf +refs/heads/master: 65e234ec2c4a0659ca22531dc1372a185f088517 diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index f72e96c25a38..3267d90bc9d6 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -90,6 +90,7 @@ static spinlock_t *kretprobe_table_lock_ptr(unsigned long hash) */ static struct kprobe_blackpoint kprobe_blacklist[] = { {"preempt_schedule",}, + {"native_get_debugreg",}, {NULL} /* Terminator */ };