Merge commit 'origin/master' into pr7043

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

1 files changed, 2 insertions, 20 deletions

diff --git a/testsuite/buildok/context_test.stp b/testsuite/buildok/context_test.stp
index 84f1cbf1..acc4ea07 100755
--- a/testsuite/buildok/context_test.stp
+++ b/testsuite/buildok/context_test.stp
@@ -1,6 +1,6 @@
 #! stap -p4
 
-function print_stuff () {
+probe begin {
 	print_regs()
 	print_backtrace()
 	bt = backtrace()
@@ -18,23 +18,5 @@ function print_stuff () {
 	printf("gid is %d\n", gid())
 	printf("egid is %d\n", egid())
 	printf("pp is %s\n", pp())
-}
-
-probe kernel.function("uptime_read_proc") ? {
-	print("NOW IN UPTIME\n")
-	print_stuff ()
-}
-
-probe kernel.function("uptime_read_proc").return ? {
-	print("DONE WITH UPTIME\n")
-	print_stuff ()
-	exit ()
-}
-
-probe begin {
-	print ("BEGIN\n")
-}
-
-probe end {
-	print ("END\n")
+	printf("sid is %d\n", sid())
 }