From owner-p4-projects@FreeBSD.ORG  Wed Jan 25 23:19:00 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5630C16A424; Wed, 25 Jan 2006 23:19:00 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1293916A420
	for <perforce@freebsd.org>; Wed, 25 Jan 2006 23:19:00 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BE71543D53
	for <perforce@freebsd.org>; Wed, 25 Jan 2006 23:18:59 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0PNIxub095890
	for <perforce@freebsd.org>; Wed, 25 Jan 2006 23:18:59 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0PNIxca095887
	for perforce@freebsd.org; Wed, 25 Jan 2006 23:18:59 GMT
	(envelope-from alc@freebsd.org)
Date: Wed, 25 Jan 2006 23:18:59 GMT
Message-Id: <200601252318.k0PNIxca095887@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90366 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2006 23:19:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=90366

Change 90366 by alc@alc_home on 2006/01/25 23:18:09

	Fix merge: opt_vmpage.h no longer exists in the superpage-enabled
	kernel.

Affected files ...

.. //depot/projects/superpages/src/sys/vm/vm_pageq.c#6 edit

Differences ...

==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#6 (text+ko) ====

@@ -28,8 +28,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.22 2006/01/24 19:24:54 alc Exp $");
 
-#include "opt_vmpage.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/linker_set.h>