From owner-svn-src-all@FreeBSD.ORG  Tue Oct 15 13:53:36 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 38EE6C68;
 Tue, 15 Oct 2013 13:53:36 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2600925C2;
 Tue, 15 Oct 2013 13:53:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FDrZTp040986;
 Tue, 15 Oct 2013 13:53:35 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FDrZL4040985;
 Tue, 15 Oct 2013 13:53:35 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201310151353.r9FDrZL4040985@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 15 Oct 2013 13:53:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256539 - head/lib/libkvm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 13:53:36 -0000

Author: glebius
Date: Tue Oct 15 13:53:35 2013
New Revision: 256539
URL: http://svnweb.freebsd.org/changeset/base/256539

Log:
  Revert r256514 for libkvm. It wasn't correct actually and breaks build.

Modified:
  head/lib/libkvm/kvm_pcpu.c

Modified: head/lib/libkvm/kvm_pcpu.c
==============================================================================
--- head/lib/libkvm/kvm_pcpu.c	Tue Oct 15 13:45:37 2013	(r256538)
+++ head/lib/libkvm/kvm_pcpu.c	Tue Oct 15 13:53:35 2013	(r256539)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/pcpu.h>
 #include <sys/sysctl.h>
-#include <sys/counter.h>
 #include <kvm.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -320,8 +319,7 @@ kvm_read_zpcpu(kvm_t *kd, void *buf, u_l
 uint64_t
 kvm_counter_u64_fetch(kvm_t *kd, u_long base)
 {
-	counter_u64_t c;
-	uint64_t r;
+	uint64_t r, c;
 
 	if (mp_ncpus == 0)
 		if (_kvm_pcpu_init(kd) < 0)