From owner-svn-src-stable-10@FreeBSD.ORG Mon Apr 27 08:06:34 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 5AF03E2A;
Mon, 27 Apr 2015 08:06:34 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 49A751F95;
Mon, 27 Apr 2015 08:06:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R86YMT094227;
Mon, 27 Apr 2015 08:06:34 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R86X5d094225;
Mon, 27 Apr 2015 08:06:33 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201504270806.t3R86X5d094225@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 27 Apr 2015 08:06:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282066 - in stable/10/sys: amd64/amd64 i386/i386
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
<svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Apr 2015 08:06:34 -0000
Author: kib
Date: Mon Apr 27 08:06:33 2015
New Revision: 282066
URL: https://svnweb.freebsd.org/changeset/base/282066
Log:
MFC r281762:
Remove duplicate definitions of MWAIT_CX hints. Identical defines in
specialreg.h are enough.
Modified:
stable/10/sys/amd64/amd64/machdep.c
stable/10/sys/i386/i386/machdep.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/10/sys/amd64/amd64/machdep.c Mon Apr 27 08:02:12 2015 (r282065)
+++ stable/10/sys/amd64/amd64/machdep.c Mon Apr 27 08:06:33 2015 (r282066)
@@ -717,15 +717,6 @@ cpu_idle_hlt(sbintime_t sbt)
*state = STATE_RUNNING;
}
-/*
- * MWAIT cpu power states. Lower 4 bits are sub-states.
- */
-#define MWAIT_C0 0xf0
-#define MWAIT_C1 0x00
-#define MWAIT_C2 0x10
-#define MWAIT_C3 0x20
-#define MWAIT_C4 0x30
-
static void
cpu_idle_mwait(sbintime_t sbt)
{
Modified: stable/10/sys/i386/i386/machdep.c
==============================================================================
--- stable/10/sys/i386/i386/machdep.c Mon Apr 27 08:02:12 2015 (r282065)
+++ stable/10/sys/i386/i386/machdep.c Mon Apr 27 08:06:33 2015 (r282066)
@@ -1359,15 +1359,6 @@ cpu_idle_hlt(sbintime_t sbt)
}
#endif
-/*
- * MWAIT cpu power states. Lower 4 bits are sub-states.
- */
-#define MWAIT_C0 0xf0
-#define MWAIT_C1 0x00
-#define MWAIT_C2 0x10
-#define MWAIT_C3 0x20
-#define MWAIT_C4 0x30
-
static void
cpu_idle_mwait(sbintime_t sbt)
{