diff options
author | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
commit | 02615365a92ca2570c1f96abc8a97674aa2ccae1 (patch) | |
tree | ebedfd91a0f6d299b39e84295e091e12c0767dc8 /runtime/sym.h | |
parent | c3bad3042df505a3470f1e20b09822a9df1d4761 (diff) | |
parent | adc67597f327cd43d58b1d0cb740dab14a75a058 (diff) | |
download | systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.gz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.xz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.zip |
Merge branch 'master' into pr6866
Conflicts:
ChangeLog: Removed
runtime/ChangeLog: Removed
runtime/sym.c: Merged
runtime/task_finder.c: Merged
tapset/ChangeLog: Removed
testsuite/ChangeLog: Removed
Diffstat (limited to 'runtime/sym.h')
-rw-r--r-- | runtime/sym.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/sym.h b/runtime/sym.h index 9d6a4ded..e642cab4 100644 --- a/runtime/sym.h +++ b/runtime/sym.h @@ -54,15 +54,15 @@ struct _stp_module { /* Defined by translator-generated stap-symbols.h. */ -struct _stp_module *_stp_modules []; -unsigned _stp_num_modules; +static struct _stp_module *_stp_modules []; +static unsigned _stp_num_modules; /* the number of modules in the arrays */ static unsigned long _stp_kretprobe_trampoline = 0; -unsigned long _stp_module_relocate (const char *module, const char *section, unsigned long offset); +static unsigned long _stp_module_relocate (const char *module, const char *section, unsigned long offset); static struct _stp_module *_stp_get_unwind_info (unsigned long addr); #endif /* _STP_SYM_H_ */ |