From owner-svn-src-stable@freebsd.org  Sun Jul  5 06:50:22 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE0EE362A90;
 Sun,  5 Jul 2020 06:50:22 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49zzq25B6vz4YXj;
 Sun,  5 Jul 2020 06:50:22 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9539795D5;
 Sun,  5 Jul 2020 06:50:22 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0656oMOE030323;
 Sun, 5 Jul 2020 06:50:22 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0656oM0o030322;
 Sun, 5 Jul 2020 06:50:22 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <202007050650.0656oM0o030322@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 5 Jul 2020 06:50:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r362939 - stable/12/usr.bin/top
X-SVN-Group: stable-12
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: stable/12/usr.bin/top
X-SVN-Commit-Revision: 362939
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jul 2020 06:50:22 -0000

Author: kib
Date: Sun Jul  5 06:50:22 2020
New Revision: 362939
URL: https://svnweb.freebsd.org/changeset/base/362939

Log:
  MFC r362711:
  top: do not try to use sysctl machdep.smp_active.

Modified:
  stable/12/usr.bin/top/machine.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/top/machine.c
==============================================================================
--- stable/12/usr.bin/top/machine.c	Sun Jul  5 05:14:33 2020	(r362938)
+++ stable/12/usr.bin/top/machine.c	Sun Jul  5 06:50:22 2020	(r362939)
@@ -278,10 +278,7 @@ machine_init(struct statics *statics)
 	size_t size;
 
 	size = sizeof(smpmode);
-	if ((sysctlbyname("machdep.smp_active", &smpmode, &size,
-	    NULL, 0) != 0 &&
-	    sysctlbyname("kern.smp.active", &smpmode, &size,
-	    NULL, 0) != 0) ||
+	if (sysctlbyname("kern.smp.active", &smpmode, &size, NULL, 0) != 0 ||
 	    size != sizeof(smpmode))
 		smpmode = 0;