4 files changed, 7 insertions, 4 deletions
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 44079b9336912..2773562baf6eb 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -351,7 +351,7 @@ linux_getcwd_common (lvp, rvp, bpp, bufp, limit, flags, td)
 		/*
 		 * step up if we're a covered vnode..
 		 */
-		while (lvp->v_flag & VROOT) {
+		while (lvp->v_vflag & VV_ROOT) {
 			struct vnode *tvp;
 
 			if (lvp == rvp)
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 7eebf69518cb8..d6259bc868f03 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -381,8 +381,9 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args)
 		goto cleanup;
 	}
 
+	mp_fixme("Unlocked vflags access.");
 	/* prevent more writers */
-	vp->v_flag |= VTEXT;
+	vp->v_vflag |= VV_TEXT;
 
 	/*
 	 * Check if file_offset page aligned. Currently we cannot handle
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index 2d4691d4db48f..175b021f0119e 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -533,7 +533,8 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp,
 	imgp->auxarg_size = sizeof(struct pecoff_args);
 	imgp->interpreted = 0;
 
-	imgp->vp->v_flag |= VTEXT;
+	mp_fixme("Unlocked vflag access.");
+	imgp->vp->v_vflag |= VV_TEXT;
 	if (sh != NULL)
 		free(sh, M_TEMP);
 	return 0;
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index ad72929f4a9d5..c8b0e1f8ab72f 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -216,7 +216,8 @@ exec_svr4_imgact(imgp)
 
 	}
 	/* Indicate that this file should not be modified */
-	imgp->vp->v_flag |= VTEXT;
+	mp_fixme("Unlocked vflag access.");
+	imgp->vp->v_vflag |= VV_TEXT;
     }
     /* Fill in process VM information */
     vmspace->vm_tsize = round_page(a_out->a_text) >> PAGE_SHIFT;