Module Name: src
Committed By: jruoho
Date: Tue Aug 14 14:38:02 UTC 2012
Modified Files:
src/sys/dev/acpi: acpi.c acpi_wakedev.c
src/sys/dev/acpi/wmi: wmi_acpi.c
Log Message:
Use KM_SLEEP.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/wmi/wmi_acpi.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.c
diff -u src/sys/dev/acpi/acpi.c:1.253 src/sys/dev/acpi/acpi.c:1.254
--- src/sys/dev/acpi/acpi.c:1.253 Tue Apr 10 13:48:24 2012
+++ src/sys/dev/acpi/acpi.c Tue Aug 14 14:38:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.253 2012/04/10 13:48:24 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.254 2012/08/14 14:38:02 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.253 2012/04/10 13:48:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.254 2012/08/14 14:38:02 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -708,7 +708,7 @@ acpi_make_devnode(ACPI_HANDLE handle, ui
case ACPI_TYPE_THERMAL:
case ACPI_TYPE_POWER:
- ad = kmem_zalloc(sizeof(*ad), KM_NOSLEEP);
+ ad = kmem_zalloc(sizeof(*ad), KM_SLEEP);
if (ad == NULL)
return AE_NO_MEMORY;
Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.24 src/sys/dev/acpi/acpi_wakedev.c:1.25
--- src/sys/dev/acpi/acpi_wakedev.c:1.24 Sat Feb 19 09:52:32 2011
+++ src/sys/dev/acpi/acpi_wakedev.c Tue Aug 14 14:38:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.24 2011/02/19 09:52:32 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.25 2012/08/14 14:38:02 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010, 2011 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.24 2011/02/19 09:52:32 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.25 2012/08/14 14:38:02 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -127,7 +127,7 @@ acpi_wakedev_init(struct acpi_devnode *a
goto out;
}
- ad->ad_wakedev = kmem_zalloc(sizeof(*ad->ad_wakedev), KM_NOSLEEP);
+ ad->ad_wakedev = kmem_zalloc(sizeof(*ad->ad_wakedev), KM_SLEEP);
if (ad->ad_wakedev == NULL)
return;
Index: src/sys/dev/acpi/wmi/wmi_acpi.c
diff -u src/sys/dev/acpi/wmi/wmi_acpi.c:1.13 src/sys/dev/acpi/wmi/wmi_acpi.c:1.14
--- src/sys/dev/acpi/wmi/wmi_acpi.c:1.13 Sun Jul 17 02:46:01 2011
+++ src/sys/dev/acpi/wmi/wmi_acpi.c Tue Aug 14 14:38:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpi.c,v 1.13 2011/07/17 02:46:01 jakllsch Exp $ */
+/* $NetBSD: wmi_acpi.c,v 1.14 2012/08/14 14:38:02 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <[email protected]>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.13 2011/07/17 02:46:01 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.14 2012/08/14 14:38:02 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -238,7 +238,7 @@ acpi_wmi_add(struct acpi_wmi_softc *sc,
for (i = offset = 0; i < n; ++i) {
- if ((wmi = kmem_zalloc(sizeof(*wmi), KM_NOSLEEP)) == NULL)
+ if ((wmi = kmem_zalloc(sizeof(*wmi), KM_SLEEP)) == NULL)
goto fail;
(void)memcpy(&wmi->guid, obj->Buffer.Pointer + offset, siz);
@@ -265,16 +265,9 @@ acpi_wmi_del(struct acpi_wmi_softc *sc)
{
struct wmi_t *wmi;
- if (SIMPLEQ_EMPTY(&sc->wmi_head) != 0)
- return;
-
while (SIMPLEQ_FIRST(&sc->wmi_head) != NULL) {
-
wmi = SIMPLEQ_FIRST(&sc->wmi_head);
SIMPLEQ_REMOVE_HEAD(&sc->wmi_head, wmi_link);
-
- KASSERT(wmi != NULL);
-
kmem_free(wmi, sizeof(*wmi));
}
}
