From owner-svn-src-releng@FreeBSD.ORG  Wed Aug  7 10:07:56 2013
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@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 ESMTP id 46E9E3E0;
 Wed,  7 Aug 2013 10:07:56 +0000 (UTC) (envelope-from kib@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 34BA22D3C;
 Wed,  7 Aug 2013 10:07:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r77A7uEg042939;
 Wed, 7 Aug 2013 10:07:56 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r77A7uXC042938;
 Wed, 7 Aug 2013 10:07:56 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201308071007.r77A7uXC042938@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 7 Aug 2013 10:07:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r254054 - releng/9.2/sys/kern
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Aug 2013 10:07:56 -0000

Author: kib
Date: Wed Aug  7 10:07:55 2013
New Revision: 254054
URL: http://svnweb.freebsd.org/changeset/base/254054

Log:
  Revert the MFC of the r244237, done as r244806.  There are indeed bugs
  in XEN pmap.  The revert hides a panic with the cost of non-working
  vfork(2), which means more obscure misbehaviour in the usermode.
  Revert is only done on the stable branch to maintain the consistent
  erratic behaviour.
  
  PR:	kern/180788
  Approved by:	re (marius)

Modified:
  releng/9.2/sys/kern/kern_fork.c
Directory Properties:
  releng/9.2/sys/   (props changed)

Modified: releng/9.2/sys/kern/kern_fork.c
==============================================================================
--- releng/9.2/sys/kern/kern_fork.c	Wed Aug  7 09:18:21 2013	(r254053)
+++ releng/9.2/sys/kern/kern_fork.c	Wed Aug  7 10:07:55 2013	(r254054)
@@ -150,7 +150,11 @@ sys_vfork(struct thread *td, struct vfor
 	int error, flags;
 	struct proc *p2;
 
+#ifdef XEN
+	flags = RFFDG | RFPROC; /* validate that this is still an issue */
+#else
 	flags = RFFDG | RFPROC | RFPPWAIT | RFMEM;
+#endif		
 	error = fork1(td, flags, 0, &p2, NULL, 0);
 	if (error == 0) {
 		td->td_retval[0] = p2->p_pid;