From owner-p4-projects  Wed Nov 13 14:30:34 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A60D37B404; Wed, 13 Nov 2002 14:30:32 -0800 (PST)
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 BD9C237B401
	for <perforce@freebsd.org>; Wed, 13 Nov 2002 14:30:31 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7CC3743E77
	for <perforce@freebsd.org>; Wed, 13 Nov 2002 14:30:31 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADMS2mV074392
	for <perforce@freebsd.org>; Wed, 13 Nov 2002 14:28:02 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADMS2I7074387
	for perforce@freebsd.org; Wed, 13 Nov 2002 14:28:02 -0800 (PST)
Date: Wed, 13 Nov 2002 14:28:02 -0800 (PST)
Message-Id: <200211132228.gADMS2I7074387@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 21047 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 21047 by peter@peter_daintree on 2002/11/13 14:27:47

	revert to vendor

Affected files ...

.. //depot/projects/ia64/sys/vm/uma_core.c#29 edit

Differences ...

==== //depot/projects/ia64/sys/vm/uma_core.c#29 (text+ko) ====

@@ -149,9 +149,7 @@
 
 /* Prototypes.. */
 
-#ifndef MD_HAVE_OBJ_ALLOC
 static void *obj_alloc(uma_zone_t, int, u_int8_t *, int);
-#endif
 static void *page_alloc(uma_zone_t, int, u_int8_t *, int);
 static void page_free(void *, int, u_int8_t);
 static uma_slab_t slab_zalloc(uma_zone_t, int);
@@ -801,7 +799,6 @@
 	return (p);
 }
 
-#ifndef MD_HAVE_OBJ_ALLOC
 /*
  * Allocates a number of pages from within an object
  *
@@ -849,7 +846,6 @@
 
 	return ((void *)retkva);
 }
-#endif
 
 /*
  * Frees a number of pages to the system
@@ -1912,7 +1908,6 @@
 	ZONE_UNLOCK(zone);
 }
 
-#ifndef MD_HAVE_UMA_ZONE_SET_OBJ
 /* See uma.h */
 int
 uma_zone_set_obj(uma_zone_t zone, struct vm_object *obj, int count)
@@ -1934,6 +1929,7 @@
 		return (0);
 	}
 
+
 	if (obj == NULL)
 		obj = vm_object_allocate(OBJT_DEFAULT,
 		    pages);
@@ -1954,7 +1950,6 @@
 
 	return (1);
 }
-#endif
 
 /* See uma.h */
 void

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message