Module Name: src
Committed By: jmcneill
Date: Tue Apr 14 22:36:54 UTC 2015
Modified Files:
src/sys/arch/aarch64/aarch64: cpu_machdep.c
src/sys/arch/arm/arm: ast.c
src/sys/arch/arm/include: cpu.h
src/sys/arch/arm/pic: pic.c
src/sys/arch/mips/mips: ipifuncs.c
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
__HAVE_PREEEMPTION -> __HAVE_PREEMPTION
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/aarch64/cpu_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/arm/ast.c
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/pic/pic.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/mips/ipifuncs.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/powerpc/booke/e500_intr.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/aarch64/aarch64/cpu_machdep.c
diff -u src/sys/arch/aarch64/aarch64/cpu_machdep.c:1.1 src/sys/arch/aarch64/aarch64/cpu_machdep.c:1.2
--- src/sys/arch/aarch64/aarch64/cpu_machdep.c:1.1 Sun Aug 10 05:47:37 2014
+++ src/sys/arch/aarch64/aarch64/cpu_machdep.c Tue Apr 14 22:36:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_machdep.c,v 1.1 2014/08/10 05:47:37 matt Exp $ */
+/* $NetBSD: cpu_machdep.c,v 1.2 2015/04/14 22:36:54 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu_machdep.c,v 1.1 2014/08/10 05:47:37 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu_machdep.c,v 1.2 2015/04/14 22:36:54 jmcneill Exp $");
#include "opt_pic.h"
@@ -112,7 +112,7 @@ dosoftints(void)
KASSERT((softints != 0) == ((ci->ci_softints >> opl) != 0));
KASSERT(opl == IPL_NONE || (softints & (1 << (opl - IPL_SOFTCLOCK))) == 0);
if (softints == 0) {
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
if (ci->ci_want_resched & RESCHED_KPREEMPT) {
ci->ci_want_resched &= ~RESCHED_KPREEMPT;
splsched();
@@ -332,7 +332,7 @@ cpu_kpreempt_enter(uintptr_t where, int
KASSERT(curcpu()->ci_mtx_count == 0);
return true;
}
- atomic_or_uint(curcpu()->ci_want_resched, RESCHED_KPREEEMPT);
+ atomic_or_uint(curcpu()->ci_want_resched, RESCHED_KPREEMPT);
#endif
return false;
}
Index: src/sys/arch/arm/arm/ast.c
diff -u src/sys/arch/arm/arm/ast.c:1.26 src/sys/arch/arm/arm/ast.c:1.27
--- src/sys/arch/arm/arm/ast.c:1.26 Wed Apr 8 18:10:08 2015
+++ src/sys/arch/arm/arm/ast.c Tue Apr 14 22:36:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ast.c,v 1.26 2015/04/08 18:10:08 matt Exp $ */
+/* $NetBSD: ast.c,v 1.27 2015/04/14 22:36:53 jmcneill Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.26 2015/04/08 18:10:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.27 2015/04/14 22:36:53 jmcneill Exp $");
#include "opt_ddb.h"
@@ -123,7 +123,7 @@ ast(struct trapframe *tf)
KASSERT(VALID_R15_PSR(tf->tf_pc, tf->tf_spsr));
#endif
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
kpreempt_disable();
#endif
struct cpu_info * const ci = curcpu();
@@ -131,13 +131,13 @@ ast(struct trapframe *tf)
ci->ci_data.cpu_ntrap++;
KDASSERT(ci->ci_cpl == IPL_NONE);
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
atomic_and_uint(&ci->ci_astpending, ~__BIT(0));
#else
ci->ci_astpending = 0;
#endif
const int want_resched = ci->ci_want_resched;
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
kpreempt_enable();
#endif
Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.88 src/sys/arch/arm/include/cpu.h:1.89
--- src/sys/arch/arm/include/cpu.h:1.88 Wed Apr 8 20:42:09 2015
+++ src/sys/arch/arm/include/cpu.h Tue Apr 14 22:36:54 2015
@@ -219,7 +219,7 @@ curcpu(void)
}
#elif !defined(MULTIPROCESSOR)
#define curcpu() (&cpu_info_store)
-#elif !defined(__HAVE_PREEEMPTION)
+#elif !defined(__HAVE_PREEMPTION)
#error MULTIPROCESSOR && !__HAVE_PREEMPTION requires TPIDRPRW_IS_CURCPU or TPIDRPRW_IS_CURLWP
#else
#error MULTIPROCESSOR && __HAVE_PREEMPTION requires TPIDRPRW_IS_CURLWP
Index: src/sys/arch/arm/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.32 src/sys/arch/arm/pic/pic.c:1.33
--- src/sys/arch/arm/pic/pic.c:1.32 Sun Apr 12 15:32:19 2015
+++ src/sys/arch/arm/pic/pic.c Tue Apr 14 22:36:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.32 2015/04/12 15:32:19 matt Exp $ */
+/* $NetBSD: pic.c,v 1.33 2015/04/14 22:36:54 jmcneill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.32 2015/04/12 15:32:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.33 2015/04/14 22:36:54 jmcneill Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -556,7 +556,7 @@ pic_do_pending_ints(register_t psw, int
percpu_putref(pic_pending_percpu);
#endif
#endif /* __HAVE_PIC_PENDING_INTRS */
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
if (newipl == IPL_NONE && (ci->ci_astpending & __BIT(1))) {
pic_set_priority(ci, IPL_SCHED);
kpreempt(0);
Index: src/sys/arch/mips/mips/ipifuncs.c
diff -u src/sys/arch/mips/mips/ipifuncs.c:1.7 src/sys/arch/mips/mips/ipifuncs.c:1.8
--- src/sys/arch/mips/mips/ipifuncs.c:1.7 Mon May 19 22:47:53 2014
+++ src/sys/arch/mips/mips/ipifuncs.c Tue Apr 14 22:36:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.7 2014/05/19 22:47:53 rmind Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.8 2015/04/14 22:36:53 jmcneill Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.7 2014/05/19 22:47:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.8 2015/04/14 22:36:53 jmcneill Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -84,7 +84,7 @@ ipi_syncicache(struct cpu_info *ci)
pmap_tlb_syncicache_wanted(ci);
}
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
static inline void
ipi_kpreempt(struct cpu_info *ci)
{
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.32 src/sys/arch/powerpc/booke/e500_intr.c:1.33
--- src/sys/arch/powerpc/booke/e500_intr.c:1.32 Fri Jan 23 09:02:42 2015
+++ src/sys/arch/powerpc/booke/e500_intr.c Tue Apr 14 22:36:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.32 2015/01/23 09:02:42 nonaka Exp $ */
+/* $NetBSD: e500_intr.c,v 1.33 2015/04/14 22:36:54 jmcneill Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.32 2015/01/23 09:02:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.33 2015/04/14 22:36:54 jmcneill Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1279,7 +1279,7 @@ e500_intr_cpu_send_ipi(cpuid_t target, u
typedef void (*ipifunc_t)(void);
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
static void
e500_ipi_kpreempt(void)
{
