From c9f2fab8a5caaccf8ccb5ffe1b9ff632b9c266d2 Mon Sep 17 00:00:00 2001
From: zab <zab>
Date: Fri, 28 Nov 2003 23:04:59 +0000
Subject: [PATCH] get x86_64 kernel-side lustre building and inserting.

- __init/exit aren't used in declarations, only definitions.
- x86_64 doesn't have a working hweight32, apparently.
- really only do the stack business in the i386 arch build.
---
 lnet/libcfs/debug.c           | 6 +-----
 lustre/portals/libcfs/debug.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 6e2c1ca..ad2c966 100644
--- 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;
diff --git a/lustre/portals/libcfs/debug.c b/lustre/portals/libcfs/debug.c
index 6e2c1ca..ad2c966 100644
--- a/lustre/portals/libcfs/debug.c
+++ b/lustre/portals/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;
-- 
1.8.3.1