Module Name: src
Committed By: christos
Date: Wed Apr 4 22:52:59 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: spl.S
src/sys/arch/i386/i386: spl.S
src/sys/arch/x86/include: intr.h
src/sys/arch/x86/x86: intr.c
Log Message:
Rename Xpreempt{recurse,resume} -> X{recurse,resume}_preempt so that
they fit the pattern. Also the debugger trap sniffer matches them
without adding special entries...
XXX: pullup-8.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amd64/amd64/spl.S
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/i386/spl.S
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/include/intr.h
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/x86/x86/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/amd64/amd64/spl.S
diff -u src/sys/arch/amd64/amd64/spl.S:1.33 src/sys/arch/amd64/amd64/spl.S:1.34
--- src/sys/arch/amd64/amd64/spl.S:1.33 Mon Apr 2 18:29:33 2018
+++ src/sys/arch/amd64/amd64/spl.S Wed Apr 4 18:52:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.33 2018/04/02 22:29:33 mlelstv Exp $ */
+/* $NetBSD: spl.S,v 1.34 2018/04/04 22:52:58 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -156,25 +156,25 @@ END(softint_trigger)
/*
- * Xpreemptrecurse()
+ * Xrecurse_preempt()
*
* Handles preemption interrupts via Xspllower().
*/
-IDTVEC(preemptrecurse)
+IDTVEC(recurse_preempt)
movl $IPL_PREEMPT,CPUVAR(ILEVEL)
sti
xorq %rdi,%rdi
call _C_LABEL(kpreempt)
cli
jmp *%r13 /* back to Xspllower */
-IDTVEC_END(preemptrecurse)
+IDTVEC_END(recurse_preempt)
/*
- * Xpreemptresume()
+ * Xresume_preempt()
*
* Handles preemption interrupts via Xdoreti().
*/
-IDTVEC(preemptresume)
+IDTVEC(resume_preempt)
movl $IPL_PREEMPT,CPUVAR(ILEVEL)
sti
testq $SEL_RPL,TF_CS(%rsp)
@@ -187,7 +187,7 @@ IDTVEC(preemptresume)
call _C_LABEL(preempt) /* from user */
cli
jmp *%r13 /* back to Xdoreti */
-IDTVEC_END(preemptresume)
+IDTVEC_END(resume_preempt)
/*
* int splraise(int s);
Index: src/sys/arch/i386/i386/spl.S
diff -u src/sys/arch/i386/i386/spl.S:1.42 src/sys/arch/i386/i386/spl.S:1.43
--- src/sys/arch/i386/i386/spl.S:1.42 Sat Jan 27 13:44:19 2018
+++ src/sys/arch/i386/i386/spl.S Wed Apr 4 18:52:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.42 2018/01/27 18:44:19 maxv Exp $ */
+/* $NetBSD: spl.S,v 1.43 2018/04/04 22:52:58 christos Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.42 2018/01/27 18:44:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.43 2018/04/04 22:52:58 christos Exp $");
#include "opt_ddb.h"
#include "opt_spldebug.h"
@@ -389,11 +389,11 @@ ENTRY(softint_trigger)
END(softint_trigger)
/*
- * Xpreemptrecurse()
+ * Xrecurse_preempt()
*
* Handles preemption interrupts via Xspllower().
*/
-IDTVEC(preemptrecurse)
+IDTVEC(recurse_preempt)
movl $IPL_PREEMPT,CPUVAR(ILEVEL)
sti
pushl $0
@@ -401,14 +401,14 @@ IDTVEC(preemptrecurse)
addl $4,%esp
cli
jmp *%esi
-IDTVEC_END(preemptrecurse)
+IDTVEC_END(recurse_preempt)
/*
- * Xpreemptresume()
+ * Xresume_preempt()
*
* Handles preemption interrupts via Xdoreti().
*/
-IDTVEC(preemptresume)
+IDTVEC(resume_preempt)
movl $IPL_PREEMPT,CPUVAR(ILEVEL)
sti
testb $CHK_UPL,TF_CS(%esp)
@@ -423,5 +423,5 @@ IDTVEC(preemptresume)
call _C_LABEL(preempt) /* from user */
cli
jmp *%esi
-IDTVEC_END(preemptresume)
+IDTVEC_END(resume_preempt)
#endif /* !XEN */
Index: src/sys/arch/x86/include/intr.h
diff -u src/sys/arch/x86/include/intr.h:1.54 src/sys/arch/x86/include/intr.h:1.55
--- src/sys/arch/x86/include/intr.h:1.54 Sat Feb 17 13:51:53 2018
+++ src/sys/arch/x86/include/intr.h Wed Apr 4 18:52:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.54 2018/02/17 18:51:53 maxv Exp $ */
+/* $NetBSD: intr.h,v 1.55 2018/04/04 22:52:58 christos Exp $ */
/*-
* Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -194,8 +194,8 @@ splraiseipl(ipl_cookie_t icookie)
*/
void Xsoftintr(void);
-void Xpreemptrecurse(void);
-void Xpreemptresume(void);
+void Xrecurse_preempt(void);
+void Xresume_preempt(void);
extern struct intrstub legacy_stubs[];
extern struct intrstub ioapic_edge_stubs[];
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.124 src/sys/arch/x86/x86/intr.c:1.125
--- src/sys/arch/x86/x86/intr.c:1.124 Sun Mar 25 22:30:08 2018
+++ src/sys/arch/x86/x86/intr.c Wed Apr 4 18:52:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.124 2018/03/26 02:30:08 knakahara Exp $ */
+/* $NetBSD: intr.c,v 1.125 2018/04/04 22:52:59 christos Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.124 2018/03/26 02:30:08 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.125 2018/04/04 22:52:59 christos Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1492,8 +1492,8 @@ cpu_intr_init(struct cpu_info *ci)
#if defined(__HAVE_PREEMPTION)
isp = kmem_zalloc(sizeof(*isp), KM_SLEEP);
- isp->is_recurse = Xpreemptrecurse;
- isp->is_resume = Xpreemptresume;
+ isp->is_recurse = Xrecurse_preempt;
+ isp->is_resume = Xresume_preempt;
fake_preempt_intrhand.ih_level = IPL_PREEMPT;
isp->is_handlers = &fake_preempt_intrhand;
isp->is_pic = &softintr_pic;
