---

yaml --- r: 99382 b: refs/heads/master c: f076644 h: refs/heads/master v: v3
git-mirror · May 25, 2008 · 4746a20 · 4746a20
1 parent 68aaff9
commit 4746a20
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 49 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfe4bb1526945e446d2912bef2e1e2cbd2c7349e
+refs/heads/master: f0766440dda7ace8a43b030f75e2dcb82449fb85
diff --git a/trunk/include/asm-x86/current.h b/trunk/include/asm-x86/current.h
@@ -1,5 +1,39 @@
+#ifndef _X86_CURRENT_H
+#define _X86_CURRENT_H
+
 #ifdef CONFIG_X86_32
-# include "current_32.h"
-#else
-# include "current_64.h"
-#endif
+#include <linux/compiler.h>
+#include <asm/percpu.h>
+
+struct task_struct;
+
+DECLARE_PER_CPU(struct task_struct *, current_task);
+static __always_inline struct task_struct *get_current(void)
+{
+	return x86_read_percpu(current_task);
+}
+
+#else /* X86_32 */
+
+#ifndef __ASSEMBLY__
+#include <asm/pda.h>
+
+struct task_struct;
+
+static __always_inline struct task_struct *get_current(void)
+{
+	return read_pda(pcurrent);
+}
+
+#else /* __ASSEMBLY__ */
+
+#include <asm/asm-offsets.h>
+#define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* X86_32 */
+
+#define current get_current()
+
+#endif /* X86_CURRENT_H */
diff --git a/trunk/include/asm-x86/current_32.h b/trunk/include/asm-x86/current_32.h
diff --git a/trunk/include/asm-x86/current_64.h b/trunk/include/asm-x86/current_64.h