---

yaml --- r: 80029 b: refs/heads/master c: 746ff60 h: refs/heads/master i: 80027: a4bcc5c v: v3
git-mirror · Jan 30, 2008 · ad8df38 · ad8df38
1 parent c84b528
commit ad8df38
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 053de044411111da00272d1b4e174e7dd743f499
+refs/heads/master: 746ff60f2627626fca0d8ddbf6b1f04d505782f4
diff --git a/trunk/include/asm-x86/desc.h b/trunk/include/asm-x86/desc.h
@@ -71,6 +71,12 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
 
 #endif
 
+static inline int desc_empty(const void *ptr)
+{
+	const u32 *desc = ptr;
+	return !(desc[0] | desc[1]);
+}
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else

diff --git a/trunk/include/asm-x86/processor_32.h b/trunk/include/asm-x86/processor_32.h
@@ -21,12 +21,6 @@
 #include <linux/init.h>
 #include <asm/desc_defs.h>
 
-static inline int desc_empty(const void *ptr)
-{
-	const u32 *desc = ptr;
-	return !(desc[0] | desc[1]);
-}
-
 /*
  * Default implementation of macro that returns current
  * instruction pointer ("program counter").

diff --git a/trunk/include/asm-x86/processor_64.h b/trunk/include/asm-x86/processor_64.h
@@ -20,12 +20,6 @@
 #include <linux/cpumask.h>
 #include <asm/desc_defs.h>
 
-static inline int desc_empty(const void *ptr)
-{
-	const u32 *desc = ptr;
-	return !(desc[0] | desc[1]);
-}
-
 /*
  * Default implementation of macro that returns current
  * instruction pointer ("program counter").