From owner-svn-src-head@FreeBSD.ORG  Sat Jul  7 08:19:35 2012
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 58AE4106566C;
	Sat,  7 Jul 2012 08:19:35 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4467C8FC0A;
	Sat,  7 Jul 2012 08:19:35 +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 q678JZea029955;
	Sat, 7 Jul 2012 08:19:35 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q678JZe6029953;
	Sat, 7 Jul 2012 08:19:35 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201207070819.q678JZe6029953@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 7 Jul 2012 08:19:35 +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: r238194 - head/sys/dev/acpica
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: Sat, 07 Jul 2012 08:19:35 -0000

Author: avg
Date: Sat Jul  7 08:19:34 2012
New Revision: 238194
URL: http://svn.freebsd.org/changeset/base/238194

Log:
  acpi_cpu_generic_cx_probe: for consistency set cpu_non_c3 here too
  
  although by default only C1 is enabled (cx_lowest=0) and enabling deeper
  states goes through acpi_cpu_set_cx_lowest which re-evaluates cpu_non_c3
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/acpica/acpi_cpu.c

Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c	Sat Jul  7 08:12:51 2012	(r238193)
+++ head/sys/dev/acpica/acpi_cpu.c	Sat Jul  7 08:19:34 2012	(r238194)
@@ -629,6 +629,7 @@ acpi_cpu_generic_cx_probe(struct acpi_cp
     cx_ptr->type = ACPI_STATE_C1;
     cx_ptr->trans_lat = 0;
     cx_ptr++;
+    sc->cpu_non_c3 = sc->cpu_cx_count;
     sc->cpu_cx_count++;
 
     /* 
@@ -653,6 +654,7 @@ acpi_cpu_generic_cx_probe(struct acpi_cp
 	    cx_ptr->type = ACPI_STATE_C2;
 	    cx_ptr->trans_lat = AcpiGbl_FADT.C2Latency;
 	    cx_ptr++;
+	    sc->cpu_non_c3 = sc->cpu_cx_count;
 	    sc->cpu_cx_count++;
 	}
     }