From 38aac2ce8bae44234a471f4dbfaad7d6e0613c99 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Thu, 26 Mar 2009 15:23:53 +0100 Subject: [PATCH] --- yaml --- r: 135596 b: refs/heads/master c: 5168ce2c647f02756803bef7b74906f485491a1c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/process.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 249d7e602660..9f7320f0df09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbdc229245e8cf5c201e68221ebf2f33d2aaf029 +refs/heads/master: 5168ce2c647f02756803bef7b74906f485491a1c diff --git a/trunk/arch/s390/kernel/process.c b/trunk/arch/s390/kernel/process.c index e0563baa1cfe..e6b480625cb3 100644 --- a/trunk/arch/s390/kernel/process.c +++ b/trunk/arch/s390/kernel/process.c @@ -163,6 +163,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long new_stackp, unsigned long unused, struct task_struct *p, struct pt_regs *regs) { + struct thread_info *ti; struct fake_frame { struct stack_frame sf; @@ -214,6 +215,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long new_stackp, p->thread.mm_segment = get_fs(); /* Don't copy debug registers */ memset(&p->thread.per_info, 0, sizeof(p->thread.per_info)); + /* Initialize per thread user and system timer values */ + ti = task_thread_info(p); + ti->user_timer = 0; + ti->system_timer = 0; return 0; }