Module Name: src
Committed By: jruoho
Date: Fri Aug 13 19:48:25 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_cpu_pstate.c acpi_cpu_tstate.c
Log Message:
Instead of packing structures that do not need to be __packed, remove two
CTASSERT(9) macros. Fixes build failure on AMD64 noted by ceg...@.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/acpi_cpu_pstate.c
cvs rdiff -u -r1.2 -r1.3 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_pstate.c
diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.16 src/sys/dev/acpi/acpi_cpu_pstate.c:1.17
--- src/sys/dev/acpi/acpi_cpu_pstate.c:1.16 Fri Aug 13 18:44:24 2010
+++ src/sys/dev/acpi/acpi_cpu_pstate.c Fri Aug 13 19:48:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.16 2010/08/13 18:44:24 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.17 2010/08/13 19:48:25 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <[email protected]>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.16 2010/08/13 18:44:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.17 2010/08/13 19:48:25 jruoho Exp $");
#include <sys/param.h>
#include <sys/evcnt.h>
@@ -363,9 +363,6 @@
val[i] = elm[i].Integer.Value;
}
- CTASSERT(sizeof(val) == sizeof(struct acpicpu_pstate) -
- offsetof(struct acpicpu_pstate, ps_freq));
-
p = &ps->ps_freq;
for (i = 0; i < 6; i++, p++)
Index: src/sys/dev/acpi/acpi_cpu_tstate.c
diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.2 src/sys/dev/acpi/acpi_cpu_tstate.c:1.3
--- src/sys/dev/acpi/acpi_cpu_tstate.c:1.2 Fri Aug 13 18:44:24 2010
+++ src/sys/dev/acpi/acpi_cpu_tstate.c Fri Aug 13 19:48:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_tstate.c,v 1.2 2010/08/13 18:44:24 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_tstate.c,v 1.3 2010/08/13 19:48:25 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <[email protected]>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.2 2010/08/13 18:44:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.3 2010/08/13 19:48:25 jruoho Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -389,9 +389,6 @@
val[i] = elm[i].Integer.Value;
}
- CTASSERT(sizeof(val) == sizeof(struct acpicpu_tstate) -
- offsetof(struct acpicpu_tstate, ts_percent));
-
p = &ts->ts_percent;
for (i = 0; i < 5; i++, p++)
