From owner-svn-src-projects@FreeBSD.ORG Fri Aug 15 11:07:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 346D549A; Fri, 15 Aug 2014 11:07:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 209372D54; Fri, 15 Aug 2014 11:07:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7FB7853095898; Fri, 15 Aug 2014 11:07:08 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7FB78xI095897; Fri, 15 Aug 2014 11:07:08 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201408151107.s7FB78xI095897@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Fri, 15 Aug 2014 11:07:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r270020 - projects/arm64/sys/arm64/arm64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2014 11:07:09 -0000 Author: andrew Date: Fri Aug 15 11:07:08 2014 New Revision: 270020 URL: http://svnweb.freebsd.org/changeset/base/270020 Log: Setup the correct struct in cpu_fork Modified: projects/arm64/sys/arm64/arm64/vm_machdep.c Modified: projects/arm64/sys/arm64/arm64/vm_machdep.c ============================================================================== --- projects/arm64/sys/arm64/arm64/vm_machdep.c Fri Aug 15 10:01:33 2014 (r270019) +++ projects/arm64/sys/arm64/arm64/vm_machdep.c Fri Aug 15 11:07:08 2014 (r270020) @@ -64,14 +64,14 @@ cpu_fork(struct thread *td1, struct proc bcopy(td1->td_pcb, pcb2, sizeof(*pcb2)); /* Set the return value registers for fork() */ - td1->td_pcb->pcb_x[8] = (uintptr_t)fork_return; - td1->td_pcb->pcb_x[9] = (uintptr_t)td2; - td1->td_pcb->pcb_x[PCB_LR] = (uintptr_t)fork_trampoline; - td1->td_pcb->pcb_sp = (uintptr_t)td1->td_frame; + td2->td_pcb->pcb_x[8] = (uintptr_t)fork_return; + td2->td_pcb->pcb_x[9] = (uintptr_t)td2; + td2->td_pcb->pcb_x[PCB_LR] = (uintptr_t)fork_trampoline; + td2->td_pcb->pcb_sp = (uintptr_t)td2->td_frame; /* Setup to release spin count in fork_exit(). */ - td1->td_md.md_spinlock_count = 1; - td1->td_md.md_saved_daif = 0; + td2->td_md.md_spinlock_count = 1; + td2->td_md.md_saved_daif = 0; } void