X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Fkprobes.c;h=790a573bbe00c6f6b2afd27dc8fac862d222ec9b;hb=66745863ecdec7abbfc3325c2d917eecb739c069;hp=471b1d18a92fc17e5df6a63122dbeb6a260d8fce;hpb=9d69294be2a363a0128f4dc0316a7a4bb29ea91f;p=linux-2.6-microblaze.git

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 471b1d18a92f..790a573bbe00 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -35,6 +35,7 @@
 #include <linux/ftrace.h>
 #include <linux/cpu.h>
 #include <linux/jump_label.h>
+#include <linux/static_call.h>
 #include <linux/perf_event.h>
 
 #include <asm/sections.h>
@@ -1561,6 +1562,7 @@ static int check_kprobe_address_safe(struct kprobe *p,
 	if (!kernel_text_address((unsigned long) p->addr) ||
 	    within_kprobe_blacklist((unsigned long) p->addr) ||
 	    jump_label_text_reserved(p->addr, p->addr) ||
+	    static_call_text_reserved(p->addr, p->addr) ||
 	    find_bug((unsigned long)p->addr)) {
 		ret = -EINVAL;
 		goto out;