git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
um
/
sys-x86_64
/
tls.c
diff --git
a/arch/um/sys-x86_64/tls.c
b/arch/um/sys-x86_64/tls.c
index
ce1bf1b
..
febbc94
100644
(file)
--- a/
arch/um/sys-x86_64/tls.c
+++ b/
arch/um/sys-x86_64/tls.c
@@
-1,14
+1,17
@@
#include "linux/sched.h"
#include "linux/sched.h"
-void debug_arch_force_load_TLS(void)
-{
-}
-
void clear_flushed_tls(struct task_struct *task)
{
}
int arch_copy_tls(struct task_struct *t)
{
void clear_flushed_tls(struct task_struct *task)
{
}
int arch_copy_tls(struct task_struct *t)
{
+ /*
+ * If CLONE_SETTLS is set, we need to save the thread id
+ * (which is argument 5, child_tid, of clone) so it can be set
+ * during context switches.
+ */
+ t->thread.arch.fs = t->thread.regs.regs.skas.regs[R8 / sizeof(long)];
+
return 0;
}
return 0;
}