Fix porting issues from 2.6.32 to 2.6.39.

Disable stub_* based syscalls (for now).

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>

diff --git a/dtrace/systrace_dev.c b/dtrace/systrace_dev.c
index 2761d9b55d2e4bf0b0779744a5c0f5123c7c9b31..3dab2a42eed25b4c3d169d60276dd887eec8af3e 100644 (file)
--- a/dtrace/systrace_dev.c
+++ b/dtrace/systrace_dev.c
@@ -27,9 +27,6 @@
 
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
-#if 0
-#include <trace/syscall.h>
-#endif
 #include <asm/unistd.h>
 
 #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;