Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  Mention distro specific elfutils development sub-packages needed when not found.
  Change system-wide probes from 'process("*").begin' to 'process.begin'.
  PR6836: tweak $$return formatting
  extend callgraph example to use $$parms / $$return
  PR6836: $$vars extensions, $$return
  small patch ...
  PR 6834
  PR6842: work around possibly null task->signal in utrace death callback
  Minor bugs in stap-client.
  build compatibility and speed hack for bundled-elfutils mode
  revise build instructions; clarifying elfutils bundling and its new hosting site
  kbuild compatibility hack for separate-objdir O= builds
  PR 6445 (partial).  Implemented system-wide utrace probes.
  Fixed compilation warning on gcc 3.x
  let $$vars work even with unsupported c types (e.g., funkytown floats)

1 files changed, 1 insertions, 1 deletions

diff --git a/stap-serverd b/stap-serverd
index 32888ecc..a6611255 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -85,7 +85,7 @@ function listen {
             fi
 	    sleep 1
 	done
-	if test $attempt = 10; then
+	if test $attempt = 5; then
 	    fatal "ERROR: cannot listen on port $port. rc==$rc"
 	fi
     done