From 6c7e2241113a6bb6c18fced62a1846c6ded9d219 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Thu, 24 May 2012 12:58:28 -0500
Subject: [PATCH] Fix uprobes_pass() logic (that the last commit broke).

---
 buildrun.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildrun.cxx b/buildrun.cxx
index c81835368..3b14a0b8e 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -544,11 +544,10 @@ set_cached_uprobes(systemtap_session& s)
 int
 uprobes_pass (systemtap_session& s)
 {
-  if (!s.need_uprobes)
+  if (!s.need_uprobes || kernel_built_uprobes(s))
     return 0;
 
-  if (!kernel_built_uprobes(s)
-      && s.kernel_config["CONFIG_UTRACE"] != string("y"))
+  if (s.kernel_config["CONFIG_UTRACE"] != string("y"))
     {
       clog << _("user-space facilities not available without kernel CONFIG_UTRACE or CONFIG_TRACEPOINTS/CONFIG_ARCH_SUPPORTS_UPROBES/CONFIG_UPROBES") << endl;
       s.set_try_server ();
-- 
2.43.5