svn commit: r282066 - in stable/10/sys: amd64/amd64 i386/i386

[Konstantin Belousov]

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)
 {