Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Aug 2013 08:08:59 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r254443 - stable/8/sys/dev/cpuctl
Message-ID:  <201308170808.r7H88xVr009515@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Sat Aug 17 08:08:58 2013
New Revision: 254443
URL: http://svnweb.freebsd.org/changeset/base/254443

Log:
  MFC r254191:
  Match malloc(9) calls with free(9), not contigfree(9).

Modified:
  stable/8/sys/dev/cpuctl/cpuctl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/cpuctl/   (props changed)

Modified: stable/8/sys/dev/cpuctl/cpuctl.c
==============================================================================
--- stable/8/sys/dev/cpuctl/cpuctl.c	Sat Aug 17 08:05:32 2013	(r254442)
+++ stable/8/sys/dev/cpuctl/cpuctl.c	Sat Aug 17 08:08:58 2013	(r254443)
@@ -346,8 +346,7 @@ update_intel(int cpu, cpuctl_update_args
 	else
 		ret = EEXIST;
 fail:
-	if (ptr != NULL)
-		contigfree(ptr, args->size, M_CPUCTL);
+	free(ptr, M_CPUCTL);
 	return (ret);
 }
 
@@ -476,8 +475,7 @@ update_via(int cpu, cpuctl_update_args_t
 	else
 		ret = 0;
 fail:
-	if (ptr != NULL)
-		contigfree(ptr, args->size, M_CPUCTL);
+	free(ptr, M_CPUCTL);
 	return (ret);
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308170808.r7H88xVr009515>