land 1.0.1 fixes on main development branch (head)

[fs/lustre-release.git] / lnet / libcfs / debug.c

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 6e2c1ca..ad2c966 100644 (file)
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -974,18 +974,14 @@ char *portals_debug_dumpstack(void)
         return buf;
 }
 
-#elif defined(CONFIG_X86)
+#elif defined(__i386__)
 
 extern int is_kernel_text_address(unsigned long addr);
 extern int lookup_symbol(unsigned long address, char *buf, int buflen);
 
 char *portals_debug_dumpstack(void)
 {
-#if defined(__x86_64__)
-        unsigned long esp = current->thread.rsp;
-#else
         unsigned long esp = current->thread.esp;
-#endif
         unsigned long *stack = (unsigned long *)&esp;
         int size;
         unsigned long addr;