diff options
| author | Josh Stone <jistone@redhat.com> | 2009-04-16 15:07:42 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2009-04-16 15:07:42 -0700 |
| commit | 9afe68eda6c01ca07a4f6010104f524a337d2050 (patch) | |
| tree | 89d3a6e0badb86c81298e8f274dc7dc3e99b102b | |
| parent | 466076411bb00af1b2d13423b47ee2835e9b1c97 (diff) | |
| download | systemtap-steved-9afe68eda6c01ca07a4f6010104f524a337d2050.tar.gz systemtap-steved-9afe68eda6c01ca07a4f6010104f524a337d2050.tar.xz systemtap-steved-9afe68eda6c01ca07a4f6010104f524a337d2050.zip | |
Privatize MAX_STACK_DEPTH
The kernel-tip tree also has a MAX_STACK_DEPTH defined in
perf_counter.h, so we need to separate our definition. I've changed the
definition in our unwinder to STP_MAX_STACK_DEPTH.
| -rw-r--r-- | runtime/unwind.c | 2 | ||||
| -rw-r--r-- | runtime/unwind/unwind.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/unwind.c b/runtime/unwind.c index f7b19def..41af72a7 100644 --- a/runtime/unwind.c +++ b/runtime/unwind.c @@ -345,7 +345,7 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, s state->label = NULL; return 1; } - if (state->stackDepth >= MAX_STACK_DEPTH) + if (state->stackDepth >= STP_MAX_STACK_DEPTH) return 0; state->stack[state->stackDepth++] = ptr.p8; break; diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h index 78a4bfef..3b6d0de0 100644 --- a/runtime/unwind/unwind.h +++ b/runtime/unwind/unwind.h @@ -23,7 +23,7 @@ #error "Unsupported dwarf unwind architecture" #endif -#define MAX_STACK_DEPTH 8 +#define STP_MAX_STACK_DEPTH 8 #ifndef BUILD_BUG_ON_ZERO #define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1) @@ -135,7 +135,7 @@ struct unwind_state { unsigned stackDepth:8; unsigned version:8; const u8 *label; - const u8 *stack[MAX_STACK_DEPTH]; + const u8 *stack[STP_MAX_STACK_DEPTH]; }; static const struct cfa badCFA = { ARRAY_SIZE(reg_info), 1 }; |