From nobody Mon Apr 18 19:09:00 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E5F0E11D5A5F; Mon, 18 Apr 2022 19:09:02 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KhxLP25dMz4Rw1; Mon, 18 Apr 2022 19:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650308942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZA4YhDMY8lU5k+Ij9b/aIx6S6cBqcKkQn3WFQUiclig=; b=NESVg0HZbA+WtGwXTak6lRMUQGTJ9Q3N2Cd3OVEk2mpXtPK0liAr0GMx9Im1UX4z2EfWmp hVgZpMTUsVtuU5VlSTWHWedvPIuXOh+KiVLoLFzwgPVvEH/yxgeWEgiJHfr0AKWAZHtTUr FNkywcXsVf8khWQZpqiiDXfTIuRCuThJmc1AuhHrs3cDlIFNdNJYCEvxFLPQ2UlBZVEqOD r0nPVoHCg1PneQRm3FubTO15mvxPNzAAKQ3Tb+xBr48gQyHzt3bGXzCvsDc/SxebCw8HFU DCksBOVCYGjf7tU/2abNSx9G7yyjoLbwg+zhuUsu0xSHPPbD7aFgHSXRE6CmfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E9CF01873A; Mon, 18 Apr 2022 19:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23IJ90Kc089744; Mon, 18 Apr 2022 19:09:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IJ90Zq089743; Mon, 18 Apr 2022 19:09:00 GMT (envelope-from git) Date: Mon, 18 Apr 2022 19:09:00 GMT Message-Id: <202204181909.23IJ90Zq089743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7c1ff7146b7a - main - powerpc cpu_idle_60x: Move some variables fully under #ifdef AIM. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c1ff7146b7a4474dff370af0c5a5d238a8ff6c6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650308942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZA4YhDMY8lU5k+Ij9b/aIx6S6cBqcKkQn3WFQUiclig=; b=rwqP3ksq/C4h/O7BwbZ4mFnqvbIvcmcf7oB0GtzDIIMwH9m+DdbYMtbMj8UEud84XiIZf+ kdk8/62u42Xp+oMAcekKeO9ireDRZFVpcu0/uLuO5Lbp/JugQ9m1LfAGTKQgW49lkjV7G6 Y3BvyZivovynJDVDEDnCkMHV9tk15ysucNeV3t0XE0QNRTSMv/IcTVDljV7jlHsFRFPFUC dHxwnyNJQOY8qzJA2sXRnBWiXWO0USgDUEIZrQijMvPV0qXYeIejfl0mF/o3XYHEqo3lY3 uM1s3pFupIOZQS677NFIiQjXrWobS0ranOgOpe7fJh3BqKI8vjGdN/yYJpzXgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650308942; a=rsa-sha256; cv=none; b=KoKOTd3Lh305QhN0KVAYgxGOXoZ8z/IQv87Xgngx8PLT4cIipcPXF57Go/W17SICy3VHgr 1UHPIKbVuuyWnSsAQDRpz+BAlJxWt9wu8F48MAie29upurYxzjVi4pXf8R+lvtcEkMd7GC YJwVxvD0DjmA3un0YBTO3khe8ykdEADn3v2BManMgu61YNx/luDJJUXHSz/4rxmZ+EJauO h9pJr/pM04V7H0EeHZEX88iHisBcMpM7IK6bgAMFmCkZNx2JewIJ258/6aVuJP/8Nuo633 suIU98u9bRmHqaV7OaxnCLgRevD7nwN6PpSTmbBXoJq77IKAldnJ+kzcOaXYgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7c1ff7146b7a4474dff370af0c5a5d238a8ff6c6 commit 7c1ff7146b7a4474dff370af0c5a5d238a8ff6c6 Author: John Baldwin AuthorDate: 2022-04-18 19:08:35 +0000 Commit: John Baldwin CommitDate: 2022-04-18 19:08:35 +0000 powerpc cpu_idle_60x: Move some variables fully under #ifdef AIM. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D34905 --- sys/powerpc/powerpc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index d1fc89b410eb..bc70d39676ef 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -737,16 +737,18 @@ cpu_idle(int busy) static void cpu_idle_60x(sbintime_t sbt) { +#ifdef AIM register_t msr; uint16_t vers; +#endif if (!powerpc_pow_enabled) return; +#ifdef AIM msr = mfmsr(); vers = mfpvr() >> 16; -#ifdef AIM switch (vers) { case IBM970: case IBM970FX: