[src/netbsd-6]: src/sys/dev/acpi Pull up following revision(s) (requested by ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/01a6a6e6a7bc
branches:  netbsd-6
changeset: 776522:01a6a6e6a7bc
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Dec 17 22:29:48 2013 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #984):
        sys/dev/acpi/acpi_cpu.h: revision 1.44
        sys/dev/acpi/acpi_cpu_tstate.c: revision 1.31
Remove the upper limit for the number of T-states.

diffstat:

 sys/dev/acpi/acpi_cpu.h        |   3 +--
 sys/dev/acpi/acpi_cpu_tstate.c |  12 ++----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diffs (57 lines):

diff -r 20a810fa7033 -r 01a6a6e6a7bc sys/dev/acpi/acpi_cpu.h
--- a/sys/dev/acpi/acpi_cpu.h   Tue Dec 17 21:08:22 2013 +0000
+++ b/sys/dev/acpi/acpi_cpu.h   Tue Dec 17 22:29:48 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.43 2011/10/18 05:08:24 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.43.8.1 2013/12/17 22:29:48 riz Exp $ */
 
 /*-
  * Copyright (c) 2010, 2011 Jukka Ruohonen <jruohonen%iki.fi@localhost>
@@ -88,7 +88,6 @@
 /*
  * T-states.
  */
-#define ACPICPU_T_STATE_MAX     0x8
 #define ACPICPU_T_STATE_RETRY   0xA
 #define ACPICPU_T_STATE_UNKNOWN         255
 
diff -r 20a810fa7033 -r 01a6a6e6a7bc sys/dev/acpi/acpi_cpu_tstate.c
--- a/sys/dev/acpi/acpi_cpu_tstate.c    Tue Dec 17 21:08:22 2013 +0000
+++ b/sys/dev/acpi/acpi_cpu_tstate.c    Tue Dec 17 22:29:48 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_tstate.c,v 1.30.8.1 2013/11/25 08:23:31 bouyer Exp $ */
+/* $NetBSD: acpi_cpu_tstate.c,v 1.30.8.2 2013/12/17 22:29:48 riz Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruohonen%iki.fi@localhost>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.30.8.1 2013/11/25 08:23:31 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.30.8.2 2013/12/17 22:29:48 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -243,11 +243,6 @@
                goto out;
        }
 
-       if (sc->sc_tstate_count > ACPICPU_T_STATE_MAX) {
-               rv = AE_LIMIT;
-               goto out;
-       }
-
        sc->sc_tstate = kmem_zalloc(sc->sc_tstate_count *
            sizeof(struct acpicpu_tstate), KM_SLEEP);
 
@@ -565,9 +560,6 @@
 
        count = 1 << width;
 
-       if (count > ACPICPU_T_STATE_MAX)
-               return AE_LIMIT;
-
        if (sc->sc_tstate != NULL)
                kmem_free(sc->sc_tstate, sc->sc_tstate_count * size);