projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
include
/
asm-powerpc
/
current.h
diff --git
a/include/asm-powerpc/current.h
b/include/asm-powerpc/current.h
index
82cd4a9
..
e2c7f06
100644
(file)
--- a/
include/asm-powerpc/current.h
+++ b/
include/asm-powerpc/current.h
@@
-1,5
+1,6
@@
#ifndef _ASM_POWERPC_CURRENT_H
#define _ASM_POWERPC_CURRENT_H
#ifndef _ASM_POWERPC_CURRENT_H
#define _ASM_POWERPC_CURRENT_H
+#ifdef __KERNEL__
/*
* This program is free software; you can redistribute it and/or
/*
* This program is free software; you can redistribute it and/or
@@
-11,9
+12,20
@@
struct task_struct;
#ifdef __powerpc64__
struct task_struct;
#ifdef __powerpc64__
+#include <linux/stddef.h>
#include <asm/paca.h>
#include <asm/paca.h>
-#define current (get_paca()->__current)
+static inline struct task_struct *get_current(void)
+{
+ struct task_struct *task;
+
+ __asm__ __volatile__("ld %0,%1(13)"
+ : "=r" (task)
+ : "i" (offsetof(struct paca_struct, __current)));
+
+ return task;
+}
+#define current get_current()
#else
#else
@@
-24,4
+36,5
@@
register struct task_struct *current asm ("r2");
#endif
#endif
+#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_CURRENT_H */
#endif /* _ASM_POWERPC_CURRENT_H */