Date: Mon, 18 Jun 2007 22:27:14 GMT From: Scott Long <scottl@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 121940 for review Message-ID: <200706182227.l5IMREnS027036@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706182227.l5IMREnS027036>