From aa1ce0b12ac8d9f04d929423c2f2279ca41e7b35 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 23 Apr 2010 16:17:40 -0700 Subject: [PATCH] --- yaml --- r: 190385 b: refs/heads/master c: 7ce5a2b9bb2e92902230e3121d8c3047fab9cb47 h: refs/heads/master i: 190383: 404beae3e1aad65a5acc084f823f3bed73e3b8fd v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/process_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e4d8103dfb04..37904b42643c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae7c9b70dcb4313ea3dbcc9a2f240dae6c2b50c0 +refs/heads/master: 7ce5a2b9bb2e92902230e3121d8c3047fab9cb47 diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c index dc9690b4c4cc..17cb3295cbf7 100644 --- a/trunk/arch/x86/kernel/process_64.c +++ b/trunk/arch/x86/kernel/process_64.c @@ -276,12 +276,12 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, set_tsk_thread_flag(p, TIF_FORK); - p->thread.fs = me->thread.fs; - p->thread.gs = me->thread.gs; p->thread.io_bitmap_ptr = NULL; savesegment(gs, p->thread.gsindex); + p->thread.gs = p->thread.gsindex ? 0 : me->thread.gs; savesegment(fs, p->thread.fsindex); + p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs; savesegment(es, p->thread.es); savesegment(ds, p->thread.ds);