Module Name: src
Committed By: riz
Date: Tue Dec 17 22:29:48 UTC 2013
Modified Files:
src/sys/dev/acpi [netbsd-6]: acpi_cpu.h acpi_cpu_tstate.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.30.8.1 -r1.30.8.2 src/sys/dev/acpi/acpi_cpu_tstate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.43 src/sys/dev/acpi/acpi_cpu.h:1.43.8.1
--- src/sys/dev/acpi/acpi_cpu.h:1.43 Tue Oct 18 05:08:24 2011
+++ src/sys/dev/acpi/acpi_cpu.h Tue Dec 17 22:29:48 2013
@@ -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 <jruoho...@iki.fi>
@@ -88,7 +88,6 @@
/*
* T-states.
*/
-#define ACPICPU_T_STATE_MAX 0x8
#define ACPICPU_T_STATE_RETRY 0xA
#define ACPICPU_T_STATE_UNKNOWN 255
Index: src/sys/dev/acpi/acpi_cpu_tstate.c
diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.30.8.1 src/sys/dev/acpi/acpi_cpu_tstate.c:1.30.8.2
--- src/sys/dev/acpi/acpi_cpu_tstate.c:1.30.8.1 Mon Nov 25 08:23:31 2013
+++ src/sys/dev/acpi/acpi_cpu_tstate.c Tue Dec 17 22:29:48 2013
@@ -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 <jruoho...@iki.fi>
@@ -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 @@ acpicpu_tstate_tss(struct acpicpu_softc
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 @@ acpicpu_tstate_fadt(struct acpicpu_softc
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);
