summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjistone <jistone>2006-01-31 23:56:40 +0000
committerjistone <jistone>2006-01-31 23:56:40 +0000
commitea18b5569264daa83c5ad8760a6dfd92180e9b22 (patch)
treebff8e0993204b1b1487144abecef8fe4dc678f21
parent91bef257e2fa860049495965b30d4162defb4891 (diff)
downloadsystemtap-steved-ea18b5569264daa83c5ad8760a6dfd92180e9b22.tar.gz
systemtap-steved-ea18b5569264daa83c5ad8760a6dfd92180e9b22.tar.xz
systemtap-steved-ea18b5569264daa83c5ad8760a6dfd92180e9b22.zip
2006-01-31 Josh Stone <joshua.i.stone@intel.com>
PR 2252 * translate.cxx (translate_pass): Fix legacy definition of read_trylock.
-rw-r--r--ChangeLog6
-rw-r--r--translate.cxx2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a70013e3..5059fbcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-31 Josh Stone <joshua.i.stone@intel.com>
+
+ PR 2252
+ * translate.cxx (translate_pass): Fix legacy definition of
+ read_trylock.
+
2006-01-30 Frank Ch. Eigler <fche@elastic.org>
* main.cxx (main): Also print elapsed real time for each pass.
diff --git a/translate.cxx b/translate.cxx
index 9aa4180b..1d4ec3ba 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -3865,7 +3865,7 @@ translate_pass (systemtap_session& s)
// XXX: old 2.6 kernel hack
s.op->newline() << "#ifndef read_trylock";
- s.op->newline() << "#define read_trylock(x) (read_lock(x),1)";
+ s.op->newline() << "#define read_trylock(x) ({ read_lock(x); 1; })";
s.op->newline() << "#endif";
s.up->emit_common_header ();