From owner-svn-src-all@FreeBSD.ORG  Mon Jul  2 20:08:12 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 42A92106566B;
	Mon,  2 Jul 2012 20:08:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 30A8A8FC08;
	Mon,  2 Jul 2012 20:08:12 +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 q62K8CC6095287;
	Mon, 2 Jul 2012 20:08:12 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q62K8Bch095285;
	Mon, 2 Jul 2012 20:08:12 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201207022008.q62K8Bch095285@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 2 Jul 2012 20:08:11 +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: r238020 - head/usr.bin/top
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 02 Jul 2012 20:08:12 -0000

Author: jhb
Date: Mon Jul  2 20:08:11 2012
New Revision: 238020
URL: http://svn.freebsd.org/changeset/base/238020

Log:
  Fix two layout bugs in the previous change:
  - Properly increase y_mem when per-CPU stats are enabled.
  - Update y_arc for per-CPU stats being enabled/disabled.
  
  MFC after:	3 days

Modified:
  head/usr.bin/top/machine.c

Modified: head/usr.bin/top/machine.c
==============================================================================
--- head/usr.bin/top/machine.c	Mon Jul  2 20:07:09 2012	(r238019)
+++ head/usr.bin/top/machine.c	Mon Jul  2 20:08:11 2012	(r238020)
@@ -263,6 +263,7 @@ update_layout(void)
 {
 
 	y_mem = 3;
+	y_arc = 4;
 	y_swap = 4 + arc_enabled;
 	y_idlecursor = 5 + arc_enabled;
 	y_message = 5 + arc_enabled;
@@ -271,7 +272,8 @@ update_layout(void)
 	Header_lines = 7 + arc_enabled;
 
 	if (pcpu_stats) {
-		y_mem = ncpus - 1;
+		y_mem += ncpus - 1;
+		y_arc += ncpus - 1;
 		y_swap += ncpus - 1;
 		y_idlecursor += ncpus - 1;
 		y_message += ncpus - 1;