X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-debug.c;h=7d97fb527aaf3237adb2a5df83defd3c111d58f3;hp=92d536196009aa2c0d63a65b5803bf773ec05b46;hb=fb436c078ddb95f2371d93a37e4f67a31701add2;hpb=2104ed0f0da3651f0cb4ab0c78a1037891d7cb4f diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c index 92d5361..7d97fb5 100644 --- a/libcfs/libcfs/linux/linux-debug.c +++ b/libcfs/libcfs/linux/linux-debug.c @@ -208,13 +208,21 @@ static int print_trace_stack(void *data, char *name) return 0; } -static void print_trace_address(void *data, unsigned long addr, int reliable) +#ifdef STACKTRACE_OPS_ADDRESS_RETURN_INT +static int +#else +static void +#endif +print_trace_address(void *data, unsigned long addr, int reliable) { char fmt[32]; touch_nmi_watchdog(); sprintf(fmt, " [<%016lx>] %s%%s\n", addr, reliable ? "": "? "); __print_symbol(fmt, addr); +#ifdef STACKTRACE_OPS_ADDRESS_RETURN_INT + return 0; +#endif } static const struct stacktrace_ops print_trace_ops = {