From owner-svn-src-projects@FreeBSD.ORG Sat Oct 18 06:20:17 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E4D31065695; Sat, 18 Oct 2008 06:20:17 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4C6378FC0C; Sat, 18 Oct 2008 06:20:17 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9I6KHA3008837; Sat, 18 Oct 2008 06:20:17 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9I6KHsd008834; Sat, 18 Oct 2008 06:20:17 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200810180620.m9I6KHsd008834@svn.freebsd.org> From: Kip Macy Date: Sat, 18 Oct 2008 06:20:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184017 - projects/release_6_3_xen/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 18 Oct 2008 06:20:17 -0000 Author: kmacy Date: Sat Oct 18 06:20:16 2008 New Revision: 184017 URL: http://svn.freebsd.org/changeset/base/184017 Log: merge xen kern workarounds Modified: projects/release_6_3_xen/sys/kern/kern_fork.c projects/release_6_3_xen/sys/kern/kern_synch.c projects/release_6_3_xen/sys/kern/subr_trap.c Modified: projects/release_6_3_xen/sys/kern/kern_fork.c ============================================================================== --- projects/release_6_3_xen/sys/kern/kern_fork.c Sat Oct 18 06:19:52 2008 (r184016) +++ projects/release_6_3_xen/sys/kern/kern_fork.c Sat Oct 18 06:20:16 2008 (r184017) @@ -112,10 +112,15 @@ vfork(td, uap) struct thread *td; struct vfork_args *uap; { - int error; + int error, flags; struct proc *p2; - error = fork1(td, RFFDG | RFPROC | RFPPWAIT | RFMEM, 0, &p2); +#ifdef XEN + flags = RFFDG | RFPROC; +#else + flags = RFFDG | RFPROC | RFPPWAIT | RFMEM; +#endif + error = fork1(td, flags, 0, &p2); if (error == 0) { td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; Modified: projects/release_6_3_xen/sys/kern/kern_synch.c ============================================================================== --- projects/release_6_3_xen/sys/kern/kern_synch.c Sat Oct 18 06:19:52 2008 (r184016) +++ projects/release_6_3_xen/sys/kern/kern_synch.c Sat Oct 18 06:20:16 2008 (r184017) @@ -64,6 +64,12 @@ __FBSDID("$FreeBSD$"); #include +#ifdef XEN +#include +#include +#include +#endif + static void synch_setup(void *dummy); SYSINIT(synch_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, synch_setup, NULL) @@ -417,6 +423,9 @@ mi_switch(int flags, struct thread *newt td, td->td_proc->p_comm, td->td_priority, td->td_inhibitors, td->td_wmesg, td->td_lockname); #endif +#ifdef XEN + PT_UPDATES_FLUSH(); +#endif sched_switch(td, newtd, flags); CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d", td, td->td_proc->p_comm, td->td_priority); Modified: projects/release_6_3_xen/sys/kern/subr_trap.c ============================================================================== --- projects/release_6_3_xen/sys/kern/subr_trap.c Sat Oct 18 06:19:52 2008 (r184016) +++ projects/release_6_3_xen/sys/kern/subr_trap.c Sat Oct 18 06:20:16 2008 (r184017) @@ -67,6 +67,12 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef XEN +#include +#include +#include +#endif + /* * Define the code needed before returning to user mode, for * trap and syscall. @@ -139,6 +145,9 @@ userret(td, frame, oticks) sched_userret(td); KASSERT(td->td_locks == 0, ("userret: Returning with %d locks held.", td->td_locks)); +#ifdef XEN + PT_UPDATES_FLUSH(); +#endif } /*