__arch_ia64__ is apparently not set, so we were hitting the gcc bug

and eating enormous amounts of stack on ia64.  Changed to __ia64__

diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h
index 34a9bbc..0752b58 100644 (file)
--- a/lnet/include/linux/kp30.h
+++ b/lnet/include/linux/kp30.h
@@ -83,7 +83,7 @@ extern unsigned int portal_printk;
 #ifndef __KERNEL__
 #define THREAD_SIZE 8192
 #endif
-#ifdef  __arch_ia64__
+#ifdef  __ia64__
 #define CDEBUG_STACK() ((unsigned long)__builtin_dwarf_cfa()&(THREAD_SIZE - 1))
 #else
 #define CDEBUG_STACK() (THREAD_SIZE -                                      \

diff --git a/lustre/portals/include/linux/kp30.h b/lustre/portals/include/linux/kp30.h
index 34a9bbc..0752b58 100644 (file)
--- a/lustre/portals/include/linux/kp30.h
+++ b/lustre/portals/include/linux/kp30.h
@@ -83,7 +83,7 @@ extern unsigned int portal_printk;
 #ifndef __KERNEL__
 #define THREAD_SIZE 8192
 #endif
-#ifdef  __arch_ia64__
+#ifdef  __ia64__
 #define CDEBUG_STACK() ((unsigned long)__builtin_dwarf_cfa()&(THREAD_SIZE - 1))
 #else
 #define CDEBUG_STACK() (THREAD_SIZE -                                      \