From 6c03164159b0fb92064e8a2447d8dfb37c81fe92 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 25 Jun 2008 00:19:04 -0400
Subject: [PATCH] --- yaml --- r: 99907 b: refs/heads/master c:
 43adfc26dea171558f944adbc9adecddf2d4602f h: refs/heads/master i:   99905:
 8e8a9a627e9b08a6fcd584bbd531c67b16fb5411   99903:
 579f16ee4fb2803a5f9516858b71c28ec07635c9 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-x86/desc_defs.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8df8cf311002..8f4e431cc0bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4583ed514ea9ac844a6eb02d33120beaedf6837f
+refs/heads/master: 43adfc26dea171558f944adbc9adecddf2d4602f
diff --git a/trunk/include/asm-x86/desc_defs.h b/trunk/include/asm-x86/desc_defs.h
index eccb4ea1f918..f7bacf357dac 100644
--- a/trunk/include/asm-x86/desc_defs.h
+++ b/trunk/include/asm-x86/desc_defs.h
@@ -75,10 +75,14 @@ struct ldttss_desc64 {
 typedef struct gate_struct64 gate_desc;
 typedef struct ldttss_desc64 ldt_desc;
 typedef struct ldttss_desc64 tss_desc;
+#define gate_offset(g) ((g).offset_low | ((unsigned long)(g).offset_middle << 16) | ((unsigned long)(g).offset_high << 32))
+#define gate_segment(g) ((g).segment)
 #else
 typedef struct desc_struct gate_desc;
 typedef struct desc_struct ldt_desc;
 typedef struct desc_struct tss_desc;
+#define gate_offset(g)		(((g).b & 0xffff0000) | ((g).a & 0x0000ffff))
+#define gate_segment(g)		((g).a >> 16)
 #endif
 
 struct desc_ptr {