diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-12-02 16:41:11 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-12-02 16:41:11 -0500 |
| commit | 6bb613f9be856632dec47cab4b27a7fe92c2fe64 (patch) | |
| tree | 76e778645ea20df5fd89981994ee249fc760d4f5 /runtime/staprun | |
| parent | 5d4ea4cc1d1f7531fb0ff4d0498957e0333a61eb (diff) | |
| parent | 4a0ae64c47b159d4dd0ea471f1f8044503843a7f (diff) | |
| download | systemtap-steved-6bb613f9be856632dec47cab4b27a7fe92c2fe64.tar.gz systemtap-steved-6bb613f9be856632dec47cab4b27a7fe92c2fe64.tar.xz systemtap-steved-6bb613f9be856632dec47cab4b27a7fe92c2fe64.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/staprun')
| -rw-r--r-- | runtime/staprun/modverify.c | 11 | ||||
| -rw-r--r-- | runtime/staprun/staprun.c | 2 | ||||
| -rw-r--r-- | runtime/staprun/staprun_funcs.c | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/runtime/staprun/modverify.c b/runtime/staprun/modverify.c index 514f09f0..4ed5eb74 100644 --- a/runtime/staprun/modverify.c +++ b/runtime/staprun/modverify.c @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "staprun.h" + #include <stdio.h> #include <nspr.h> @@ -28,13 +31,13 @@ #include <cert.h> #include <certt.h> -#include "nsscommon.h" -#include "staprun.h" -#include "modverify.h" - #include <sys/stat.h> +#include <sys/types.h> #include <errno.h> +#include "nsscommon.h" +#include "modverify.h" + /* Function: int check_cert_db_permissions (const char *cert_db_path); * * Check that the given certificate directory and its contents have diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c index 078be4cf..5bd5163a 100644 --- a/runtime/staprun/staprun.c +++ b/runtime/staprun/staprun.c @@ -372,7 +372,7 @@ int send_relocation_kernel () free (line); line=NULL; if (symbol == NULL) continue; /* OOM? */ -#ifdef __powerpc__ +#ifdef __powerpc64__ #define KERNEL_RELOC_SYMBOL ".__start" #else #define KERNEL_RELOC_SYMBOL "_stext" diff --git a/runtime/staprun/staprun_funcs.c b/runtime/staprun/staprun_funcs.c index 8f3d84ad..db58cd4f 100644 --- a/runtime/staprun/staprun_funcs.c +++ b/runtime/staprun/staprun_funcs.c @@ -12,7 +12,6 @@ #include "config.h" #include "staprun.h" -#include "modverify.h" #include <sys/mount.h> #include <sys/utsname.h> @@ -20,6 +19,8 @@ #include <pwd.h> #include <assert.h> +#include "modverify.h" + typedef int (*check_module_path_func)(const char *module_path, int module_fd); extern long init_module(void *, unsigned long, const char *); @@ -507,8 +508,8 @@ check_groups ( void assert_stap_module_permissions( const char *module_path, int module_fd, - const void *module_data, - off_t module_size + const void *module_data __attribute__ ((unused)), + off_t module_size __attribute__ ((unused)) ) { int check_groups_rc; int check_signature_rc; |