From: Josh Stone <jistone@redhat.com>
Date: Wed, 3 Oct 2012 17:56:42 +0000 (-0700)
Subject: PR13814: Note the relevant kernel commits, and allow >=3.4
X-Git-Tag: release-2.0~37
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=ee13a5e0346cbb392f2b00c25c188711d27c3d5c;p=systemtap.git

PR13814: Note the relevant kernel commits, and allow >=3.4
---

diff --git a/staprun/staprun.c b/staprun/staprun.c
index 36ad1d9c0..e02a2dd1f 100644
--- a/staprun/staprun.c
+++ b/staprun/staprun.c
@@ -276,8 +276,9 @@ void disable_kprobes_optimization()
         int rc, fd;
         struct utsname uts;
 
-        /* PR13814; disable this facility for new enough kernels */
-        if ((uname (&uts) == 0) && (strverscmp (uts.release, "3.4") > 0))
+        /* PR13814; disable this facility for new enough kernels, containing
+         * these fix commits: 86b4ce31 46484688 3f33ab1c */
+        if ((uname (&uts) == 0) && (strverscmp (uts.release, "3.4") >= 0))
                 return;
 
         if (getenv ("STAP_PR13193_OVERRIDE"))