diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
| commit | 9a1d168e1bc2893120bb7c0d9932dd22f97d0b55 (patch) | |
| tree | f7d419f1601419aa0aebda102a6b14bdf7653443 /arch/openrisc/kernel/process.c | |
| parent | nfsd4: const-ify nfsd4_ops (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
| download | linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.tar.xz linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.zip | |
Merge tag 'v4.12-rc5' into nfsd tree
Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.
Diffstat (limited to 'arch/openrisc/kernel/process.c')
| -rw-r--r-- | arch/openrisc/kernel/process.c | 2 |
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); |