svn commit: r184017 - projects/release_6_3_xen/sys/kern
Kip Macy
kmacy at FreeBSD.org
Sat Oct 18 06:20:17 UTC 2008
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 <machine/cpu.h>
+#ifdef XEN
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#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 <machine/cpu.h>
#include <machine/pcb.h>
+#ifdef XEN
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#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
}
/*
More information about the svn-src-projects
mailing list