From owner-svn-src-head@FreeBSD.ORG  Sun Jun  3 08:30:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D32B7106566B;
	Sun,  3 Jun 2012 08:30:00 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B99DB8FC14;
	Sun,  3 Jun 2012 08:30:00 +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 q538U0Dc045099;
	Sun, 3 Jun 2012 08:30:00 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q538U0ZY045098;
	Sun, 3 Jun 2012 08:30:00 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201206030830.q538U0ZY045098@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 3 Jun 2012 08:30:00 +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: r236504 - head/usr.sbin/cpucontrol
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: Sun, 03 Jun 2012 08:30:01 -0000

Author: avg
Date: Sun Jun  3 08:30:00 2012
New Revision: 236504
URL: http://svn.freebsd.org/changeset/base/236504

Log:
  cpucontrol: use CPUCTL_UPDATE ioctl on correct file descriptor
  
  I guess that means that microcode update has never worked for AMD CPUs.
  Please also note that only older AMD CPUs and micrcode file format are
  supported anyway (pre 10h family).
  
  MFC after:	1 week

Modified:
  head/usr.sbin/cpucontrol/amd.c

Modified: head/usr.sbin/cpucontrol/amd.c
==============================================================================
--- head/usr.sbin/cpucontrol/amd.c	Sun Jun  3 08:01:12 2012	(r236503)
+++ head/usr.sbin/cpucontrol/amd.c	Sun Jun  3 08:30:00 2012	(r236504)
@@ -160,7 +160,7 @@ amd_update(const char *dev, const char *
 
 		args.data = fw_image;
 		args.size = st.st_size;
-		error = ioctl(fd, CPUCTL_UPDATE, &args);
+		error = ioctl(devfd, CPUCTL_UPDATE, &args);
 		if (error < 0) {
 			fprintf(stderr, "failed.\n");
 			warn("ioctl()");