Module Name: src
Committed By: jruoho
Date: Mon Aug 9 13:41:39 UTC 2010
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/dev/acpi: acpi_cpu.h acpi_cpu_cstate.c
Log Message:
Remove a redundant function.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/acpi_cpu_cstate.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/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.7 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.8
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.7 Mon Aug 9 04:27:07 2010
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Mon Aug 9 13:41:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.7 2010/08/09 04:27:07 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.8 2010/08/09 13:41:39 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_md.c,v 1.7 2010/08/09 04:27:07 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.8 2010/08/09 13:41:39 jruoho Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -138,22 +138,12 @@
}
int
-acpicpu_md_idle_init(void)
+acpicpu_md_idle_start(void)
{
const size_t size = sizeof(native_idle_text);
x86_disable_intr();
x86_cpu_idle_get(&native_idle, native_idle_text, size);
- x86_enable_intr();
-
- return 0;
-}
-
-int
-acpicpu_md_idle_start(void)
-{
-
- x86_disable_intr();
x86_cpu_idle_set(acpicpu_cstate_idle, "acpi");
x86_enable_intr();
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.10 src/sys/dev/acpi/acpi_cpu.h:1.11
--- src/sys/dev/acpi/acpi_cpu.h:1.10 Sun Aug 8 18:47:54 2010
+++ src/sys/dev/acpi/acpi_cpu.h Mon Aug 9 13:41:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.10 2010/08/08 18:47:54 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.11 2010/08/09 13:41:38 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <[email protected]>
@@ -191,7 +191,6 @@
uint32_t acpicpu_md_cap(void);
uint32_t acpicpu_md_quirks(void);
uint32_t acpicpu_md_cpus_running(void);
-int acpicpu_md_idle_init(void);
int acpicpu_md_idle_start(void);
int acpicpu_md_idle_stop(void);
void acpicpu_md_idle_enter(int, int);
Index: src/sys/dev/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.17 src/sys/dev/acpi/acpi_cpu_cstate.c:1.18
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.17 Mon Aug 9 05:00:24 2010
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Mon Aug 9 13:41:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.17 2010/08/09 05:00:24 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.18 2010/08/09 13:41:38 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_cstate.c,v 1.17 2010/08/09 05:00:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.18 2010/08/09 13:41:38 jruoho Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -165,18 +165,12 @@
{
struct acpicpu_softc *sc = device_private(self);
static ONCE_DECL(once_start);
- static ONCE_DECL(once_save);
int rv;
/*
* Save the existing idle-mechanism and claim the idle_loop(9).
* This should be called after all ACPI CPUs have been attached.
*/
- rv = RUN_ONCE(&once_save, acpicpu_md_idle_init);
-
- if (rv != 0)
- return rv;
-
rv = RUN_ONCE(&once_start, acpicpu_md_idle_start);
if (rv == 0)
