Branch b1_8

b=18092

fix following warning:
cc1: warnings being treated as errors
/cache/build/BUILD/lustre-1.8.0.123/lnet/libcfs/linux/linux-debug.c:215:
warning: 'print_trace_warning_symbol' defined but not used
/cache/build/BUILD/lustre-1.8.0.123/lnet/libcfs/linux/linux-debug.c:222:
warning: 'print_trace_warning' defined but not used
/cache/build/BUILD/lustre-1.8.0.123/lnet/libcfs/linux/linux-debug.c:227:
warning: 'print_trace_stack' defined but not used
/cache/build/BUILD/lustre-1.8.0.123/lnet/libcfs/linux/linux-debug.c:242:
warning: 'print_trace_address' defined but not used

diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c
index 9a693ea..7da6eda 100644 (file)
--- a/lnet/libcfs/linux/linux-debug.c
+++ b/lnet/libcfs/linux/linux-debug.c
@@ -206,7 +206,7 @@ void lbug_with_loc(const char *file, const char *func, const int line)
 
 #ifdef __KERNEL__
 
-#ifdef HAVE_DUMP_TRACE
+#if defined(HAVE_DUMP_TRACE) && !(defined(HAVE_SHOW_TASK))
 #include <linux/nmi.h>
 #include <asm/stacktrace.h>