From owner-svn-src-all@FreeBSD.ORG  Sat Jan 15 19:21:29 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 07A4C106566C;
	Sat, 15 Jan 2011 19:21:29 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB7408FC08;
	Sat, 15 Jan 2011 19:21:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0FJLSRJ034634;
	Sat, 15 Jan 2011 19:21:28 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0FJLSdY034632;
	Sat, 15 Jan 2011 19:21:28 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201101151921.p0FJLSdY034632@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 15 Jan 2011 19:21:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217453 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Jan 2011 19:21:29 -0000

Author: alc
Date: Sat Jan 15 19:21:28 2011
New Revision: 217453
URL: http://svn.freebsd.org/changeset/base/217453

Log:
  For some time now, the kernel and kmem objects have been ordinary
  OBJT_PHYS objects.  Thus, there is no need for handling them specially
  in vm_fault().  In fact, this special case handling would have led to
  an assertion failure just before the call to pmap_enter().
  
  Reviewed by:	kib@
  MFC after:	6 weeks

Modified:
  head/sys/vm/vm_fault.c

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Sat Jan 15 19:16:56 2011	(r217452)
+++ head/sys/vm/vm_fault.c	Sat Jan 15 19:21:28 2011	(r217453)
@@ -383,11 +383,8 @@ RetryFault:;
 			 * found the page ).
 			 */
 			vm_page_busy(fs.m);
-			if (fs.m->valid != VM_PAGE_BITS_ALL &&
-				fs.m->object != kernel_object && fs.m->object != kmem_object) {
+			if (fs.m->valid != VM_PAGE_BITS_ALL)
 				goto readrest;
-			}
-
 			break;
 		}