From owner-svn-src-head@FreeBSD.ORG  Thu Mar 22 14:11:11 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E685106564A;
	Thu, 22 Mar 2012 14:11:11 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3995E8FC1D;
	Thu, 22 Mar 2012 14:11:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2MEBB4a027430;
	Thu, 22 Mar 2012 14:11:11 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2MEBBIU027428;
	Thu, 22 Mar 2012 14:11:11 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201203221411.q2MEBBIU027428@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 22 Mar 2012 14:11:11 +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: r233306 - head/libexec/rtld-elf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Mar 2012 14:11:11 -0000

Author: kib
Date: Thu Mar 22 14:11:10 2012
New Revision: 233306
URL: http://svn.freebsd.org/changeset/base/233306

Log:
  Remove the fragments which are not needed on FreeBSD.  The caltech
  malloc hardly would ever be updated.
  
  Reviewed by:  bde, kan
  MFC after:    2 weeks

Modified:
  head/libexec/rtld-elf/malloc.c

Modified: head/libexec/rtld-elf/malloc.c
==============================================================================
--- head/libexec/rtld-elf/malloc.c	Thu Mar 22 12:23:32 2012	(r233305)
+++ head/libexec/rtld-elf/malloc.c	Thu Mar 22 14:11:10 2012	(r233306)
@@ -59,15 +59,6 @@ static char *rcsid = "$FreeBSD$";
 #include <sys/param.h>
 #include <sys/mman.h>
 #include "rtld_printf.h"
-#ifndef BSD
-#define MAP_COPY	MAP_PRIVATE
-#define MAP_FILE	0
-#define MAP_ANON	0
-#endif
-
-#ifndef BSD		/* Need do better than this */
-#define NEED_DEV_ZERO	1
-#endif
 
 static void morecore();
 static int findbucket();
@@ -492,12 +483,6 @@ int	n;
 	int	fd = -1;
 	int	offset;
 
-#ifdef NEED_DEV_ZERO
-	fd = open(_PATH_DEVZERO, O_RDWR, 0);
-	if (fd == -1)
-		perror(_PATH_DEVZERO);
-#endif
-
 	if (pagepool_end - pagepool_start > pagesz) {
 		caddr_t	addr = (caddr_t)
 			(((long)pagepool_start + pagesz - 1) & ~(pagesz - 1));
@@ -517,8 +502,5 @@ int	n;
 	pagepool_end = pagepool_start + n * pagesz;
 	pagepool_start += offset;
 
-#ifdef NEED_DEV_ZERO
-	close(fd);
-#endif
 	return n;
 }