Module Name: src
Committed By: snj
Date: Thu Apr 23 17:47:13 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: kern_synch.c
Log Message:
Pull up following revision(s) (requested by yamt in ticket #720):
sys/kern/kern_synch.c: revision 1.262
kpreempt: report a failure of cpu_kpreempt_enter. otherwise x86 trap()
loops infinitely. PR/41202.
To generate a diff of this commit:
cvs rdiff -u -r1.254.2.5 -r1.254.2.6 src/sys/kern/kern_synch.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/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.254.2.5 src/sys/kern/kern_synch.c:1.254.2.6
--- src/sys/kern/kern_synch.c:1.254.2.5 Fri Feb 6 01:56:19 2009
+++ src/sys/kern/kern_synch.c Thu Apr 23 17:47:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.254.2.5 2009/02/06 01:56:19 snj Exp $ */
+/* $NetBSD: kern_synch.c,v 1.254.2.6 2009/04/23 17:47:13 snj Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.254.2.5 2009/02/06 01:56:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.254.2.6 2009/04/23 17:47:13 snj Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -376,6 +376,7 @@
static char in_critical_section;
static char kernel_lock_held;
static char is_softint;
+static char cpu_kpreempt_enter_fail;
bool
kpreempt(uintptr_t where)
@@ -434,6 +435,7 @@
* interrupt to retry later.
*/
splx(s);
+ failed = (uintptr_t)&cpu_kpreempt_enter_fail;
break;
}
/* Do it! */
