CVS commit: src/sys/dev/acpi/acpica

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Jan  9 21:14:42 UTC 2016

Modified Files:
        src/sys/dev/acpi/acpica: OsdMisc.c OsdSchedule.c

Log Message:
merge new acpica


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpica/OsdMisc.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/acpica/OsdSchedule.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/acpica/OsdMisc.c
diff -u src/sys/dev/acpi/acpica/OsdMisc.c:1.14 src/sys/dev/acpi/acpica/OsdMisc.c:1.15
--- src/sys/dev/acpi/acpica/OsdMisc.c:1.14	Fri Dec 27 15:55:59 2013
+++ src/sys/dev/acpi/acpica/OsdMisc.c	Sat Jan  9 16:14:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: OsdMisc.c,v 1.14 2013/12/27 20:55:59 christos Exp $	*/
+/*	$NetBSD: OsdMisc.c,v 1.15 2016/01/09 21:14:42 christos Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.14 2013/12/27 20:55:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.15 2016/01/09 21:14:42 christos Exp $");
 
 #include "opt_acpi.h"
 #include "opt_ddb.h"
@@ -198,17 +198,10 @@ void
 acpi_osd_debugger(void)
 {
 #ifdef ACPI_DEBUG
-	static int beenhere;
 	ACPI_PARSE_OBJECT obj;
 	label_t	acpi_jmpbuf;
 	label_t	*savejmp;
 
-	if (beenhere == 0) {
-		printf("Initializing ACPICA debugger...\n");
-		AcpiDbInitialize();
-		beenhere = 1;
-	}
-
 	printf("Entering ACPICA debugger...\n");
 	savejmp = db_recover;
 	setjmp(&acpi_jmpbuf);

Index: src/sys/dev/acpi/acpica/OsdSchedule.c
diff -u src/sys/dev/acpi/acpica/OsdSchedule.c:1.17 src/sys/dev/acpi/acpica/OsdSchedule.c:1.18
--- src/sys/dev/acpi/acpica/OsdSchedule.c:1.17	Fri Dec 27 13:53:25 2013
+++ src/sys/dev/acpi/acpica/OsdSchedule.c	Sat Jan  9 16:14:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: OsdSchedule.c,v 1.17 2013/12/27 18:53:25 christos Exp $	*/
+/*	$NetBSD: OsdSchedule.c,v 1.18 2016/01/09 21:14:42 christos Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.17 2013/12/27 18:53:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.18 2016/01/09 21:14:42 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -113,9 +113,6 @@ AcpiOsExecute(ACPI_EXECUTE_TYPE Type, AC
 	case OSL_NOTIFY_HANDLER:
 		pri = 3;
 		break;
-	case OSL_DEBUGGER_THREAD:
-		pri = 0;
-		break;
 	default:
 		return AE_BAD_PARAMETER;
 	}