From owner-svn-src-head@FreeBSD.ORG  Thu Jul  7 13:37:47 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09DC210656DF;
	Thu,  7 Jul 2011 13:37:47 +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 EE3838FC0A;
	Thu,  7 Jul 2011 13:37:46 +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 p67DbkIF065291;
	Thu, 7 Jul 2011 13:37:46 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p67DbkTn065288;
	Thu, 7 Jul 2011 13:37:46 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201107071337.p67DbkTn065288@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 7 Jul 2011 13:37:46 +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: r223841 - head/usr.bin/top
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: Thu, 07 Jul 2011 13:37:47 -0000

Author: jhb
Date: Thu Jul  7 13:37:46 2011
New Revision: 223841
URL: http://svn.freebsd.org/changeset/base/223841

Log:
  Always skip the kernel idle process if requested, it is not specific to
  the 'CPU' mode.
  
  PR:		bin/158677
  Reported by:	arundel
  MFC after:	3 days

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

Modified: head/usr.bin/top/machine.c
==============================================================================
--- head/usr.bin/top/machine.c	Thu Jul  7 11:59:51 2011	(r223840)
+++ head/usr.bin/top/machine.c	Thu Jul  7 13:37:46 2011	(r223841)
@@ -701,17 +701,16 @@ get_process_info(struct system_info *si,
 			/* skip zombies */
 			continue;
 
+		if (!show_kidle && pp->ki_tdflags & TDF_IDLETD)
+			/* skip kernel idle process */
+			continue;
+		    
 		if (displaymode == DISP_CPU && !show_idle &&
 		    (pp->ki_pctcpu == 0 ||
 		     pp->ki_stat == SSTOP || pp->ki_stat == SIDL))
 			/* skip idle or non-running processes */
 			continue;
 
-		if (displaymode == DISP_CPU && !show_kidle &&
-		    pp->ki_tdflags & TDF_IDLETD)
-			/* skip kernel idle process */
-			continue;
-		    
 		if (displaymode == DISP_IO && !show_idle && p_io == 0)
 			/* skip processes that aren't doing I/O */
 			continue;