From owner-p4-projects@FreeBSD.ORG  Mon Jun 18 22:27:15 2007
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 7CF0D16A46E; Mon, 18 Jun 2007 22:27:15 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 25E1516A46D
	for <perforce@freebsd.org>; Mon, 18 Jun 2007 22:27:15 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1639B13C46A
	for <perforce@freebsd.org>; Mon, 18 Jun 2007 22:27:15 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5IMRE1L027051
	for <perforce@freebsd.org>; Mon, 18 Jun 2007 22:27:14 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IMREnS027036
	for perforce@freebsd.org; Mon, 18 Jun 2007 22:27:14 GMT
	(envelope-from scottl@freebsd.org)
Date: Mon, 18 Jun 2007 22:27:14 GMT
Message-Id: <200706182227.l5IMREnS027036@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121940 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: Mon, 18 Jun 2007 22:27:15 -0000

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

Change 121940 by scottl@scottl-deimos on 2007/06/18 22:27:12

	Step through rev 1.184 of cam_xpt.c

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#66 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#66 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.183 2007/04/27 14:23:05 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.184 2007/05/14 21:48:52 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -995,7 +995,7 @@
 	 */
 	xsoftc.xpt_config_hook =
 	    (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook),
-					      M_TEMP, M_NOWAIT | M_ZERO);
+					      M_CAMXPT, M_NOWAIT | M_ZERO);
 	if (xsoftc.xpt_config_hook == NULL) {
 		printf("xpt_attach: Cannot malloc config hook "
 		       "- failing attach\n");
@@ -1004,7 +1004,7 @@
 
 	xsoftc.xpt_config_hook->ich_func = xpt_config;
 	if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) {
-		free (xsoftc.xpt_config_hook, M_TEMP);
+		free (xsoftc.xpt_config_hook, M_CAMXPT);
 		printf("xpt_attach: config_intrhook_establish failed "
 		       "- failing attach\n");
 	}
@@ -4653,7 +4653,6 @@
 	return (device);
 }
 
-void
 xpt_devise_transport(struct cam_path *path)
 {
 	struct ccb_pathinq cpi;
@@ -5273,7 +5272,7 @@
 
 		/* Release our hook so that the boot can continue. */
 		config_intrhook_disestablish(xsoftc.xpt_config_hook);
-		free(xsoftc.xpt_config_hook, M_TEMP);
+		free(xsoftc.xpt_config_hook, M_CAMXPT);
 		xsoftc.xpt_config_hook = NULL;
 	}