summaryrefslogtreecommitdiffstats
path: root/arch/openrisc
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-06-04 15:21:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-06-04 15:21:52 +0200
commit978267b6430c07d62cb38f83e058a3132c52eca1 (patch)
tree1a744c8230cd5a72adc363ca93458a748c664abe /arch/openrisc
parent6bc51cbaa9d75c7c240282da5ff270815caccac0 (diff)
parentff86bf0c65f14346bf2440534f9ba5ac232c39a0 (diff)
downloadblackbird-op-linux-978267b6430c07d62cb38f83e058a3132c52eca1.tar.gz
blackbird-op-linux-978267b6430c07d62cb38f83e058a3132c52eca1.zip
Merge branch 'timers/urgent' into WIP.timers
Pick up urgent fixes to avoid conflicts.
Diffstat (limited to 'arch/openrisc')
-rw-r--r--arch/openrisc/kernel/process.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c
index f8da545854f9..106859ae27ff 100644
--- a/arch/openrisc/kernel/process.c
+++ b/arch/openrisc/kernel/process.c
@@ -167,8 +167,6 @@ copy_thread(unsigned long clone_flags, unsigned long usp,
top_of_kernel_stack = sp;
- p->set_child_tid = p->clear_child_tid = NULL;
-
/* Locate userspace context on stack... */
sp -= STACK_FRAME_OVERHEAD; /* redzone */
sp -= sizeof(struct pt_regs);
OpenPOWER on IntegriCloud