diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-13 03:50:03 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-13 03:50:03 +1000 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/um/sys-x86_64/syscalls.c | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
| download | op-kernel-dev-e049d1ca3094f3d1d94617f456a9961202f96e3a.zip op-kernel-dev-e049d1ca3094f3d1d94617f456a9961202f96e3a.tar.gz | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/um/sys-x86_64/syscalls.c')
| -rw-r--r-- | arch/um/sys-x86_64/syscalls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c index 01b91f9..b3f6350 100644 --- a/arch/um/sys-x86_64/syscalls.c +++ b/arch/um/sys-x86_64/syscalls.c @@ -103,6 +103,9 @@ long arch_prctl_skas(struct task_struct *task, int code, switch(code){ case ARCH_SET_FS: + current->thread.arch.fs = (unsigned long) ptr; + save_registers(pid, ¤t->thread.regs.regs); + break; case ARCH_SET_GS: save_registers(pid, ¤t->thread.regs.regs); break; @@ -140,9 +143,8 @@ long sys_clone(unsigned long clone_flags, unsigned long newsp, void arch_switch_to_skas(struct task_struct *from, struct task_struct *to) { - if(to->thread.arch.fs == 0) + if((to->thread.arch.fs == 0) || (to->mm == NULL)) return; arch_prctl_skas(to, ARCH_SET_FS, (void __user *) to->thread.arch.fs); } - |
