From a622fb9c2191ede7a3d7a17d8031f9de5bab8b8e Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Fri, 27 Jun 2008 12:04:03 -0700
Subject: [PATCH] --- yaml --- r: 99975 b: refs/heads/master c:
 df366e9822beca97115ba9745cbe1ea1f26fb111 h: refs/heads/master i:   99973:
 320962b31e23855581d26d06079c82b1660afece   99971:
 c6ee7a8982c6051281023b22f071acbd00adad33   99967:
 760aeb1cecfd88d12557e52a5ec53f2a79a4323b v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-x86/irqflags.h  | 22 +++++++++++++---------
 trunk/include/asm-x86/processor.h |  3 ---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 79e8c590899d..77fc1146eb0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3294a33e765d8308c3e17b951a13e0db9cf5f00
+refs/heads/master: df366e9822beca97115ba9745cbe1ea1f26fb111
diff --git a/trunk/include/asm-x86/irqflags.h b/trunk/include/asm-x86/irqflags.h
index d17e1f623dbb..17e7a1701c97 100644
--- a/trunk/include/asm-x86/irqflags.h
+++ b/trunk/include/asm-x86/irqflags.h
@@ -111,7 +111,20 @@ static inline unsigned long __raw_local_irq_save(void)
 #define DISABLE_INTERRUPTS(x)	cli
 
 #ifdef CONFIG_X86_64
+#define SWAPGS	swapgs
+/*
+ * Currently paravirt can't handle swapgs nicely when we
+ * don't have a stack we can rely on (such as a user space
+ * stack).  So we either find a way around these or just fault
+ * and emulate if a guest tries to call swapgs directly.
+ *
+ * Either way, this is a good way to document that we don't
+ * have a reliable stack. x86_64 only.
+ */
 #define SWAPGS_UNSAFE_STACK	swapgs
+
+#define PARAVIRT_ADJUST_EXCEPTION_FRAME	/*  */
+
 #define INTERRUPT_RETURN	iretq
 #define USERGS_SYSRET64				\
 	swapgs;					\
@@ -177,15 +190,6 @@ static inline void trace_hardirqs_fixup(void)
 #else
 
 #ifdef CONFIG_X86_64
-/*
- * Currently paravirt can't handle swapgs nicely when we
- * don't have a stack we can rely on (such as a user space
- * stack).  So we either find a way around these or just fault
- * and emulate if a guest tries to call swapgs directly.
- *
- * Either way, this is a good way to document that we don't
- * have a reliable stack. x86_64 only.
- */
 #define ARCH_TRACE_IRQS_ON		call trace_hardirqs_on_thunk
 #define ARCH_TRACE_IRQS_OFF		call trace_hardirqs_off_thunk
 #define ARCH_LOCKDEP_SYS_EXIT		call lockdep_sys_exit_thunk
diff --git a/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h
index df2459f5ebbb..7f7382704592 100644
--- a/trunk/include/asm-x86/processor.h
+++ b/trunk/include/asm-x86/processor.h
@@ -531,9 +531,6 @@ static inline void load_sp0(struct tss_struct *tss,
 }
 
 #define set_iopl_mask native_set_iopl_mask
-#define SWAPGS	swapgs
-
-#define PARAVIRT_ADJUST_EXCEPTION_FRAME	/*  */
 #endif /* CONFIG_PARAVIRT */
 
 /*