Module Name: src Committed By: cegger Date: Wed Jul 21 14:59:32 UTC 2010
Modified Files: src/sys/dev/acpi: acpi_cpu.c Log Message: ACPI enumerates cpus with 0..n. Fixes panic reported by Patrick Welche on current-users@ Fixes panic on my own HP Pavilion laptop To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_cpu.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.c diff -u src/sys/dev/acpi/acpi_cpu.c:1.3 src/sys/dev/acpi/acpi_cpu.c:1.4 --- src/sys/dev/acpi/acpi_cpu.c:1.3 Mon Jul 19 00:59:32 2010 +++ src/sys/dev/acpi/acpi_cpu.c Wed Jul 21 14:59:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu.c,v 1.3 2010/07/19 00:59:32 christos Exp $ */ +/* $NetBSD: acpi_cpu.c,v 1.4 2010/07/21 14:59:31 cegger 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.c,v 1.3 2010/07/19 00:59:32 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.4 2010/07/21 14:59:31 cegger Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -271,10 +271,9 @@ CPU_INFO_ITERATOR cii; struct cpu_info *ci; - KASSERT(id != 0); for (CPU_INFO_FOREACH(cii, ci)) { - if (id - 1 == ci->ci_cpuid) - return id - 1; + if (id == ci->ci_cpuid) + return id; } return 0xFFFFFF;