--- ./xen/include/asm-x86/config.h.stackstack	2006-07-25 14:38:28.000000000 -0400
+++ ./xen/include/asm-x86/config.h	2006-07-25 14:38:31.000000000 -0400
@@ -67,10 +67,10 @@
 
 #ifndef NDEBUG
 #define MEMORY_GUARD
+#endif
 #ifdef __x86_64__
 #define STACK_ORDER 2
 #endif
-#endif
 
 #ifndef STACK_ORDER
 #define STACK_ORDER 1