ARM: dts: alt: Add DA9063 PMIC node

[linux-2.6-microblaze.git] / kernel / kprobes.c

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index f4ddfdd..c83e547 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1396,7 +1396,7 @@ bool __weak arch_within_kprobe_blacklist(unsigned long addr)
               addr < (unsigned long)__kprobes_text_end;
 }
 
-bool within_kprobe_blacklist(unsigned long addr)
+static bool __within_kprobe_blacklist(unsigned long addr)
 {
        struct kprobe_blacklist_entry *ent;
 
@@ -1410,7 +1410,26 @@ bool within_kprobe_blacklist(unsigned long addr)
                if (addr >= ent->start_addr && addr < ent->end_addr)
                        return true;
        }
+       return false;
+}
 
+bool within_kprobe_blacklist(unsigned long addr)
+{
+       char symname[KSYM_NAME_LEN], *p;
+
+       if (__within_kprobe_blacklist(addr))
+               return true;
+
+       /* Check if the address is on a suffixed-symbol */
+       if (!lookup_symbol_name(addr, symname)) {
+               p = strchr(symname, '.');
+               if (!p)
+                       return false;
+               *p = '\0';
+               addr = (unsigned long)kprobe_lookup_name(symname, 0);
+               if (addr)
+                       return __within_kprobe_blacklist(addr);
+       }
        return false;
 }