Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

2 files changed, 17 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 8ec00f2b..88076db3 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,21 @@
   Probing of absolute statements can be done using the
   kprobe.statement(ADDRESS).absolute construct.
 
+- EXPERIMENTAL support for user process unwinding. A new collection of
+  tapset functions have been added to handle user space backtraces from
+  probe points that support them (currently process and timer probes -
+  for timer probes test whether or not in user space first with the
+  already existing user_mode() function). The new tapset functions are:
+    uaddr - User space address of current running task.
+    usymname - Return the symbol of an address in the current task.
+    usymdata - Return the symbol and module offset of an address.
+    print_ustack - Print out stack for the current task from string.
+    print_ubacktrace - Print stack back trace for current task.
+    ubacktrace - Hex backtrace of current task stack.
+  Please read http://sourceware.org/ml/systemtap/2009-q2/msg00364.html
+  on the current restrictions and possible changes in the future and
+  give feedback if you want to influence future developments.
+
 * What's new in version 0.9.5
 
 - New probes process().insn and process().insn.block that allows
diff --git a/git_version.sh b/git_version.sh
index d39d96c9..d7945d71 100755
--- a/git_version.sh
+++ b/git_version.sh
@@ -180,7 +180,7 @@ fi
 
 # Detect git tools (should work with old and new git versions)
 git_found=yes
-for git_tool in git-symbolic-ref git-rev-parse git-diff-files git-diff-index git
+for git_tool in git-symbolic-ref git-rev-parse git-diff-files git-diff-index git git-describe
 do
     if [ x`which $git_tool 2>/dev/null` = "x" ]; then
         git_found="'$git_tool' not found"
@@ -207,7 +207,7 @@ if [ "x$git_repo_dir" != "x" ] && [ "x${abs_repo_dir}" = "x${abs_srcdir}/.git" ]
     git_repo=yes
     if [ "x$git_found" = "xyes" ]; then
         # git-1.4 and probably earlier understand "git-rev-parse HEAD"
-        git_shaid=`git-rev-parse HEAD | $SED -n 's/^\(.\{8\}\).*/\1/p'`
+        git_shaid=`git-describe`
         if [ "x$git_shaid" = "x" ]; then
             git_errors="${git_errors+${git_errors}; }error running 'git-rev-parse HEAD'"
         fi