fix kprobe.* probes so they don't break -p4 if script also has kernel.* probes

* tapsets.cxx (kprobe_derived_probe): Use enter_k[ret]probe>>2<<_probe.
* testsuite/buildok/thirtyone.stp: Test this.

1 files changed, 4 insertions, 0 deletions

diff --git a/testsuite/buildok/thirtyone.stp b/testsuite/buildok/thirtyone.stp
new file mode 100755
index 00000000..8a97d84f
--- /dev/null
+++ b/testsuite/buildok/thirtyone.stp
@@ -0,0 +1,4 @@
+#! stap -p4
+
+probe kprobe.function("sys_open") {}
+probe kernel.function("sys_close") {}