From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 13:59:11 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 5165216A4E0; Tue, 15 Aug 2006 13:59:11 +0000 (UTC)
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 2CEE016A4DA
	for <perforce@FreeBSD.org>; Tue, 15 Aug 2006 13:59:11 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E985243D4C
	for <perforce@FreeBSD.org>; Tue, 15 Aug 2006 13:59:10 +0000 (GMT)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDxAJl093880
	for <perforce@FreeBSD.org>; Tue, 15 Aug 2006 13:59:10 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDxAZU093877
	for perforce@freebsd.org; Tue, 15 Aug 2006 13:59:10 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Tue, 15 Aug 2006 13:59:10 GMT
Message-Id: <200608151359.k7FDxAZU093877@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 104028 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: Tue, 15 Aug 2006 13:59:11 -0000

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

Change 104028 by rdivacky@rdivacky_witten on 2006/08/15 13:58:45

	MALLOC -> malloc and FREE -> free
	
	Pointed out by: jhb

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 (text+ko) ====

@@ -82,14 +82,14 @@
 
 	if (child != 0) {
 	   	/* non-exec call */
-   		MALLOC(em, struct linux_emuldata *, sizeof *em, M_LINUX, M_WAITOK | M_ZERO);
+   		em = (struct linux_emuldata *) malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO);
 		em->pid = child;
 		if (flags & CLONE_VM) {
 		   	/* handled later in the code */
 		} else {
 		   	struct linux_emuldata_shared *s;
 
-   			MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO);
+   			s = (struct linux_emuldata_shared *) malloc(sizeof *s, M_LINUX, M_WAITOK | M_ZERO);
 			em->shared = s;
 			s->refs = 1;
 			s->group_pid = child;
@@ -174,7 +174,7 @@
 
 	em->shared->refs--;
 	if (em->shared->refs == 0)
-		FREE(em->shared, M_LINUX);
+		free(em->shared, M_LINUX);
 	EMUL_SHARED_WUNLOCK(&emul_shared_lock);
 
 	if (child_clear_tid != NULL) {
@@ -202,7 +202,7 @@
 	}
 
 	/* clean the stuff up */
-	FREE(em, M_LINUX);
+	free(em, M_LINUX);
 }
 
 /* 
@@ -234,10 +234,10 @@
 
 		em->shared->refs--;
 		if (em->shared->refs == 0)
-		   	FREE(em->shared, M_LINUX);
+		   	free(em->shared, M_LINUX);
 		EMUL_SHARED_WUNLOCK(&emul_shared_lock);
 
-		FREE(em, M_LINUX);
+		free(em, M_LINUX);
 	}
 }