From 6a783d278b6afb6a210844fd39774fdbf0bd8f16 Mon Sep 17 00:00:00 2001 From: Eugeniy Meshcheryakov Date: Sat, 8 Aug 2009 15:51:44 +0200 Subject: Use nop instructions without parameters on arm Fixes FTBFS, see https://buildd.debian.org/fetch.cgi?pkg=systemtap;ver=0.9.9-1;arch=armel;stamp=1249664825 --- includes/sys/sdt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index f179c2a7..e3a605c5 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -68,7 +68,7 @@ #define STAP_UNINLINE_LABEL(label) \ __extension__ static volatile long labelval __attribute__ ((unused)) = (long) &&label -#if defined __x86_64__ || defined __i386__ || defined __powerpc__ +#if defined __x86_64__ || defined __i386__ || defined __powerpc__ || defined __arm__ #define STAP_NOP "\tnop " #else #define STAP_NOP "\tnop 0 " -- cgit From 81b0eb8071ab21f554f0b154c1c58fcf186888c5 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Mon, 10 Aug 2009 11:47:17 -0400 Subject: It is not an error or warning if the local database of authorized signing certificates does not exist. It just means that the signed module is untrusted. --- runtime/staprun/modverify.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runtime/staprun/modverify.c b/runtime/staprun/modverify.c index 15447279..6dc192b2 100644 --- a/runtime/staprun/modverify.c +++ b/runtime/staprun/modverify.c @@ -33,6 +33,7 @@ #include "modverify.h" #include +#include /* Function: int check_cert_db_permissions (const char *cert_db_path); * @@ -125,6 +126,10 @@ check_cert_db_permissions (const char *cert_db_path) { rc = stat (cert_db_path, & info); if (rc) { + /* It is ok if the directory does not exist. This simply means that no signing + certificates have been authorized yet. */ + if (errno == ENOENT) + return 0; fprintf (stderr, "Could not obtain information on certificate database directory %s.\n", cert_db_path); perror (""); -- cgit From 8c938ec723aad41c6cafcdef24679d40f310396c Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 10 Aug 2009 17:44:31 +0200 Subject: Only add extra error on no probes found if no previous errors already shown. * elaborate.cxx (semantic_pass): Don't add "no probes found" if session already had other errors. --- elaborate.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elaborate.cxx b/elaborate.cxx index 93500239..1d7f7930 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -1455,7 +1455,7 @@ semantic_pass (systemtap_session& s) if (rc == 0) rc = semantic_pass_vars (s); if (rc == 0) rc = semantic_pass_stats (s); - if (s.probes.size() == 0 && !s.listing_mode) + if (s.num_errors() == 0 && s.probes.size() == 0 && !s.listing_mode) throw semantic_error ("no probes found"); } catch (const semantic_error& e) -- cgit From 770e94e841ccaf6fc7446709b85d4152245ab5b9 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Mon, 10 Aug 2009 12:13:31 -0400 Subject: PR10506 experiment: use /sbin/insmod for uprobes.ko loading * runtime/staprun/staprun.c (enable_uprobes): insmod, not insert_module(). --- runtime/staprun/staprun.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c index c64bf5b3..7eb7f28f 100644 --- a/runtime/staprun/staprun.c +++ b/runtime/staprun/staprun.c @@ -132,9 +132,14 @@ static int enable_uprobes(void) snprintf (runtimeko, sizeof(runtimeko), "%s/uprobes/uprobes.ko", (getenv("SYSTEMTAP_RUNTIME") ?: PKGDATADIR "/runtime")); dbug(2, "Inserting uprobes module from SystemTap runtime %s.\n", runtimeko); - argv[0] = NULL; + i = 0; + argv[i++] = "/sbin/insmod"; + argv[i++] = runtimeko; + argv[i] = NULL; + if (run_as(0, 0, 0, argv[0], argv) == 0) + return 0; - return insert_module(runtimeko, NULL, argv); + return 1; /* failure */ } static int insert_stap_module(void) -- cgit