lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: unify current.h

Browse Source 
Simply stitch these together. There are just two definitions that are shared
but the file is resonably small and putting these things together shows that
further unifications requires a unification of the per cpu / pda handling
between both arches.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Christoph Lameter
2008-05-09 19:09:48 -07:00
committed by Thomas Gleixner
parent bfe4bb1526
commit f0766440dd
3 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/asm-x86/current.h
View File

@@ -1,5 +1,39 @@
#ifndef _X86_CURRENT_H
#define _X86_CURRENT_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "current_32.h" #include <linux/compiler.h>
#else #include <asm/percpu.h>
# include "current_64.h"
#endif 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 */

17
include/asm-x86/current_32.h
View File

@@ -1,17 +0,0 @@
#ifndef _I386_CURRENT_H
#define _I386_CURRENT_H
#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);
}
#define current get_current()
#endif /* !(_I386_CURRENT_H) */

27
include/asm-x86/current_64.h
View File

@@ -1,27 +0,0 @@
#ifndef _X86_64_CURRENT_H
#define _X86_64_CURRENT_H
#if !defined(__ASSEMBLY__)
struct task_struct;
#include <asm/pda.h>
static inline struct task_struct *get_current(void)
{
struct task_struct *t = read_pda(pcurrent);
return t;
}
#define current get_current()
#else
#ifndef ASM_OFFSET_H
#include <asm/asm-offsets.h>
#endif
#define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg
#endif
#endif /* !(_X86_64_CURRENT_H) */