From bd45fc2640d6a8e4f0fc5b3bce2454a0c3134f08 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 21 Oct 2012 22:33:39 -0400 Subject: [PATCH] --- yaml --- r: 340319 b: refs/heads/master c: ab75819d3942a34d151a34fd43f346d5d8a48148 h: refs/heads/master i: 340317: 31e5e6982ac21a46ee9061b27ed5ee102b974a78 340315: 9c01d993c65f7d3516d6ae00465565154b7722ef 340311: 8bfdb4ba016d5b2cc415ce516c5697feaa04f83f 340303: 3bbd355d5d3ec005b052bf153116222b07da7c9d 340287: ffdbc6b767e429da6524768c7a4ddbae0bd0bde6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27477119eec0..3e2331616499 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea516b11545afa5b1420621981c1411a62bef87e +refs/heads/master: ab75819d3942a34d151a34fd43f346d5d8a48148 diff --git a/trunk/arch/powerpc/kernel/process.c b/trunk/arch/powerpc/kernel/process.c index 3665d287780f..f6d244db9203 100644 --- a/trunk/arch/powerpc/kernel/process.c +++ b/trunk/arch/powerpc/kernel/process.c @@ -745,7 +745,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, /* Copy registers */ sp -= sizeof(struct pt_regs); childregs = (struct pt_regs *) sp; - if (!regs) { + if (unlikely(p->flags & PF_KTHREAD)) { struct thread_info *ti = (void *)task_stack_page(p); memset(childregs, 0, sizeof(struct pt_regs)); childregs->gpr[1] = sp + sizeof(struct pt_regs);