[Xen-changelog] [xen-unstable] x86: Fix save_all regs macro for new CONFIG_FRAME_POINTER define.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1181491247 -3600
# Node ID 608ddb14259b193826685c4deb22b63d9131376c
# Parent  91aeaf000ca25e1cdd40184966dac71c03fbd3a7
x86: Fix save_all regs macro for new CONFIG_FRAME_POINTER define.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/include/asm-x86/x86_32/asm_defns.h |    8 ++++++--
 xen/include/asm-x86/x86_64/asm_defns.h |    8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff -r 91aeaf000ca2 -r 608ddb14259b xen/include/asm-x86/x86_32/asm_defns.h
--- a/xen/include/asm-x86/x86_32/asm_defns.h    Sun Jun 10 16:12:51 2007 +0100
+++ b/xen/include/asm-x86/x86_32/asm_defns.h    Sun Jun 10 17:00:47 2007 +0100
@@ -3,11 +3,16 @@
 
 #include <asm/percpu.h>
 
-#ifndef NDEBUG
+#ifdef CONFIG_FRAME_POINTER
 /* Indicate special exception stack frame by inverting the frame pointer. */
 #define SETUP_EXCEPTION_FRAME_POINTER           \
         movl  %esp,%ebp;                        \
         notl  %ebp
+#else
+#define SETUP_EXCEPTION_FRAME_POINTER
+#endif
+
+#ifndef NDEBUG
 #define ASSERT_INTERRUPT_STATUS(x)              \
         pushf;                                  \
         testb $X86_EFLAGS_IF>>8,1(%esp);        \
@@ -15,7 +20,6 @@
         ud2a;                                   \
 1:      addl  $4,%esp;
 #else
-#define SETUP_EXCEPTION_FRAME_POINTER
 #define ASSERT_INTERRUPT_STATUS(x)
 #endif
 
diff -r 91aeaf000ca2 -r 608ddb14259b xen/include/asm-x86/x86_64/asm_defns.h
--- a/xen/include/asm-x86/x86_64/asm_defns.h    Sun Jun 10 16:12:51 2007 +0100
+++ b/xen/include/asm-x86/x86_64/asm_defns.h    Sun Jun 10 17:00:47 2007 +0100
@@ -3,11 +3,16 @@
 
 #include <asm/percpu.h>
 
-#ifndef NDEBUG
+#ifdef CONFIG_FRAME_POINTER
 /* Indicate special exception stack frame by inverting the frame pointer. */
 #define SETUP_EXCEPTION_FRAME_POINTER           \
         movq  %rsp,%rbp;                        \
         notq  %rbp
+#else
+#define SETUP_EXCEPTION_FRAME_POINTER
+#endif
+
+#ifndef NDEBUG
 #define ASSERT_INTERRUPT_STATUS(x)              \
         pushf;                                  \
         testb $X86_EFLAGS_IF>>8,1(%rsp);        \
@@ -15,7 +20,6 @@
         ud2a;                                   \
 1:      addq  $8,%rsp;
 #else
-#define SETUP_EXCEPTION_FRAME_POINTER
 #define ASSERT_INTERRUPT_STATUS(x)
 #endif
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog