Module Name: src
Committed By: matt
Date: Wed Apr 8 16:37:32 UTC 2015
Modified Files:
src/sys/arch/arm/arm: arm_machdep.c
Log Message:
Small tweaks for preemption.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/arm/arm_machdep.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/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.44 src/sys/arch/arm/arm/arm_machdep.c:1.45
--- src/sys/arch/arm/arm/arm_machdep.c:1.44 Wed Apr 8 07:29:44 2015
+++ src/sys/arch/arm/arm/arm_machdep.c Wed Apr 8 16:37:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_machdep.c,v 1.44 2015/04/08 07:29:44 matt Exp $ */
+/* $NetBSD: arm_machdep.c,v 1.45 2015/04/08 16:37:32 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.44 2015/04/08 07:29:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.45 2015/04/08 16:37:32 matt Exp $");
#include <sys/exec.h>
#include <sys/proc.h>
@@ -266,7 +266,7 @@ cpu_need_resched(struct cpu_info *ci, in
#ifdef __HAVE_PREEMPTION
atomic_or_uint(&l->l_dopreempt, DOPREEMPT_ACTIVE);
if (ci == cur_ci) {
- softint_trigger(SOFTINT_KPREEMPT);
+ ci->ci_astpending |= 2;
} else {
ipi = IPI_KPREEMPT;
goto send_ipi;
@@ -274,7 +274,7 @@ cpu_need_resched(struct cpu_info *ci, in
#endif /* __HAVE_PREEMPTION */
return;
}
- ci->ci_astpending = 1;
+ ci->ci_astpending |= 1;
#ifdef MULTIPROCESSOR
if (ci == curcpu() || !immed)
return;
