From 9cd75479c267a8656a3e30344566ae614e2e4b2e Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Thu, 13 Oct 2011 12:45:48 -0400 Subject: [PATCH] Fix porting issues from 2.6.32 to 2.6.39. Disable stub_* based syscalls (for now). Signed-off-by: Kris Van Hees --- dtrace/systrace_dev.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dtrace/systrace_dev.c b/dtrace/systrace_dev.c index 2761d9b55d2e..3dab2a42eed2 100644 --- a/dtrace/systrace_dev.c +++ b/dtrace/systrace_dev.c @@ -27,9 +27,6 @@ #include #include -#if 0 -#include -#endif #include #include "dtrace.h" @@ -60,31 +57,25 @@ void systrace_provide(void *arg, const dtrace_probedesc_t *desc) return; for (i = 0; i < NR_syscalls; i++) { -#if 0 - struct syscall_metadata *sm = syscall_nr_to_meta(i); - const char *nm; - - if (sm == NULL) - continue; -#else const char *nm = systrace_info->sysent[i].name; int sz; -#endif -printk(KERN_INFO "systrace_provide: [%d] = %s\n", i, nm); + if (nm == NULL) continue; if (systrace_info->sysent[i].stsy_underlying == NULL) continue; -#if 0 - nm = sm->name; -#endif sz = strlen(nm); if (sz > 4 && memcmp(nm, "sys_", 4) == 0) nm += 4; +#if 0 else if (sz > 5 && memcmp(nm, "stub_", 5) == 0) nm += 5; +#else + else if (sz > 5 && memcmp(nm, "stub_", 5) == 0) + continue; +#endif if (dtrace_probe_lookup(syscall_id, NULL, nm, "entry") != 0) continue; -- 2.50.1