svn commit: r189572 - in head/sys: amd64/amd64 i386/i386
Robert Watson
rwatson at FreeBSD.org
Mon Mar 9 06:11:18 PDT 2009
Author: rwatson
Date: Mon Mar 9 13:11:16 2009
New Revision: 189572
URL: http://svn.freebsd.org/changeset/base/189572
Log:
Trim comments about the MP-safety of various bits of the amd64/i386
system call entry path and i386 IP checksum generation: we now assume
all code is MPSAFE unless explicitly marked otherwise. Remove XXX
Giant comments along similar lines: the code by the comments either
doesn't need or doesn't want Giant (especially the NMI handler).
MFC after: 3 days
Modified:
head/sys/amd64/amd64/trap.c
head/sys/i386/i386/in_cksum.c
head/sys/i386/i386/trap.c
Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c Mon Mar 9 11:18:41 2009 (r189571)
+++ head/sys/amd64/amd64/trap.c Mon Mar 9 13:11:16 2009 (r189572)
@@ -386,7 +386,6 @@ trap(struct trapframe *frame)
#ifdef DEV_ISA
case T_NMI:
/* machine/parity/power fail/"kitchen sink" faults */
- /* XXX Giant */
if (isa_nmi(code) == 0) {
#ifdef KDB
/*
@@ -530,7 +529,6 @@ trap(struct trapframe *frame)
#ifdef DEV_ISA
case T_NMI:
- /* XXX Giant */
/* machine/parity/power fail/"kitchen sink" faults */
if (isa_nmi(code) == 0) {
#ifdef KDB
@@ -820,9 +818,6 @@ syscall(struct trapframe *frame)
orig_tf_rflags = frame->tf_rflags;
if (p->p_sysent->sv_prepsyscall) {
- /*
- * The prep code is MP aware.
- */
(*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms);
} else {
if (code == SYS_syscall || code == SYS___syscall) {
@@ -841,10 +836,6 @@ syscall(struct trapframe *frame)
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg;
-
- /*
- * copyin and the ktrsyscall()/ktrsysret() code is MP-aware
- */
KASSERT(narg <= sizeof(args) / sizeof(args[0]),
("Too many syscall arguments!"));
error = 0;
Modified: head/sys/i386/i386/in_cksum.c
==============================================================================
--- head/sys/i386/i386/in_cksum.c Mon Mar 9 11:18:41 2009 (r189571)
+++ head/sys/i386/i386/in_cksum.c Mon Mar 9 13:11:16 2009 (r189572)
@@ -33,9 +33,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
- * MPsafe: alfred
- */
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
Modified: head/sys/i386/i386/trap.c
==============================================================================
--- head/sys/i386/i386/trap.c Mon Mar 9 11:18:41 2009 (r189571)
+++ head/sys/i386/i386/trap.c Mon Mar 9 13:11:16 2009 (r189572)
@@ -461,7 +461,6 @@ trap(struct trapframe *frame)
goto userout;
#else /* !POWERFAIL_NMI */
/* machine/parity/power fail/"kitchen sink" faults */
- /* XXX Giant */
if (isa_nmi(code) == 0) {
#ifdef KDB
/*
@@ -658,7 +657,6 @@ trap(struct trapframe *frame)
* in kernel space because that is useful when
* debugging the kernel.
*/
- /* XXX Giant */
if (user_dbreg_trap() &&
!(PCPU_GET(curpcb)->pcb_flags & PCB_VM86CALL)) {
/*
@@ -692,7 +690,6 @@ trap(struct trapframe *frame)
}
goto out;
#else /* !POWERFAIL_NMI */
- /* XXX Giant */
/* machine/parity/power fail/"kitchen sink" faults */
if (isa_nmi(code) == 0) {
#ifdef KDB
@@ -999,14 +996,10 @@ syscall(struct trapframe *frame)
orig_tf_eflags = frame->tf_eflags;
if (p->p_sysent->sv_prepsyscall) {
- /*
- * The prep code is MP aware.
- */
(*p->p_sysent->sv_prepsyscall)(frame, args, &code, ¶ms);
} else {
/*
* Need to check if this is a 32 bit or 64 bit syscall.
- * fuword is MP aware.
*/
if (code == SYS_syscall) {
/*
@@ -1034,9 +1027,6 @@ syscall(struct trapframe *frame)
narg = callp->sy_narg;
- /*
- * copyin and the ktrsyscall()/ktrsysret() code is MP-aware
- */
if (params != NULL && narg != 0)
error = copyin(params, (caddr_t)args,
(u_int)(narg * sizeof(int)));
More information about the svn-src-head
mailing list