Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 6 insertions, 6 deletions

diff --git a/testsuite/buildok/process_test.stp b/testsuite/buildok/process_test.stp
index 90de8b69..ba3fadf1 100755
--- a/testsuite/buildok/process_test.stp
+++ b/testsuite/buildok/process_test.stp
@@ -1,31 +1,31 @@
 #! stap -p4
 
-probe process.create {
+probe kprocess.create {
   log(pp())
   log(sprint(task))
 }
 
-probe process.start {
+probe kprocess.start {
   log(pp())
 }
 
-probe process.exec {
+probe kprocess.exec {
   log(pp())
   log(filename)
 }
 
-probe process.exec_complete {
+probe kprocess.exec_complete {
   log(pp())
   log(sprint(errno))
   log(sprint(success))
 }
 
-probe process.exit {
+probe kprocess.exit {
   log(pp())
   log(sprint(code))
 }
 
-probe process.release {
+probe kprocess.release {
   log(pp())
   log(sprint(task))
 }