From cb76d9b05cc823e5b6116988414dc0020da728ac Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 28 Jul 2006 20:22:58 +0000
Subject: [PATCH] Retire SYF_ARGMASK and remove both SYF_MPSAFE and
 SYF_ARGMASK.  sy_narg is now back to just being an argument count.

---
 sys/amd64/amd64/trap.c        | 2 +-
 sys/amd64/ia32/ia32_syscall.c | 2 +-
 sys/arm/arm/trap.c            | 4 ++--
 sys/i386/i386/trap.c          | 2 +-
 sys/ia64/ia32/ia32_trap.c     | 2 +-
 sys/ia64/ia64/trap.c          | 4 ++--
 sys/powerpc/aim/trap.c        | 2 +-
 sys/powerpc/powerpc/trap.c    | 2 +-
 sys/sparc64/sparc64/trap.c    | 2 +-
 sys/sys/sysent.h              | 3 ---
 10 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index e5a3a81b84a0..ebad9a0f69eb 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -778,7 +778,7 @@ syscall(frame)
   	else
  		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	/*
 	 * copyin and the ktrsyscall()/ktrsysret() code is MP-aware
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index 470ce639bf0d..e007b3a16b41 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -154,7 +154,7 @@ ia32_syscall(struct trapframe frame)
   	else
  		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	/*
 	 * copyin and the ktrsyscall()/ktrsysret() code is MP-aware
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c
index 8e0bef681614..27d45fe48646 100644
--- a/sys/arm/arm/trap.c
+++ b/sys/arm/arm/trap.c
@@ -910,7 +910,7 @@ syscall(struct thread *td, trapframe_t *frame, u_int32_t insn)
 		callp = &p->p_sysent->sv_table[0];
 	else
 		callp = &p->p_sysent->sv_table[code];
-	nargs = callp->sy_narg & SYF_ARGMASK;
+	nargs = callp->sy_narg;
 	memcpy(copyargs, ap, nap * sizeof(register_t));
 	if (nargs > nap) {
 		error = copyin((void *)frame->tf_usr_sp, copyargs + nap,
@@ -930,7 +930,7 @@ syscall(struct thread *td, trapframe_t *frame, u_int32_t insn)
 	if (error == 0) {
 		td->td_retval[0] = 0;
 		td->td_retval[1] = 0;
-		STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK));
+		STOPEVENT(p, S_SCE, callp->sy_narg);
 		PTRACESTOP_SC(p, td, S_PT_SCE);
 		AUDIT_SYSCALL_ENTER(code, td);
 		error = (*callp->sy_call)(td, args);
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 1481b154b81c..fd93c2f427d6 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -975,7 +975,7 @@ syscall(frame)
   	else
  		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	/*
 	 * copyin and the ktrsyscall()/ktrsysret() code is MP-aware
diff --git a/sys/ia64/ia32/ia32_trap.c b/sys/ia64/ia32/ia32_trap.c
index a5c74d46a08b..af3f225fe43a 100644
--- a/sys/ia64/ia32/ia32_trap.c
+++ b/sys/ia64/ia32/ia32_trap.c
@@ -96,7 +96,7 @@ ia32_syscall(struct trapframe *tf)
 	else
 		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	/* copyin and the ktrsyscall()/ktrsysret() code is MP-aware */
 	if (params != NULL && narg != 0)
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 3ac45ce2393c..c1a1cfaca8a1 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -1003,7 +1003,7 @@ syscall(struct trapframe *tf)
 
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_SYSCALL))
-		ktrsyscall(code, (callp->sy_narg & SYF_ARGMASK), args);
+		ktrsyscall(code, callp->sy_narg, args);
 #endif
 	CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
 	    td->td_proc->p_pid, td->td_proc->p_comm, code);
@@ -1012,7 +1012,7 @@ syscall(struct trapframe *tf)
 	td->td_retval[1] = 0;
 	tf->tf_scratch.gr10 = EJUSTRETURN;
 
-	STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK));
+	STOPEVENT(p, S_SCE, callp->sy_narg);
 
 	PTRACESTOP_SC(p, td, S_PT_SCE);
 
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index da34c2688648..33ad897a199e 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -389,7 +389,7 @@ syscall(struct trapframe *frame)
   	else
  		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	if (narg > n) {
 		bcopy(params, args, n * sizeof(register_t));
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index da34c2688648..33ad897a199e 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -389,7 +389,7 @@ syscall(struct trapframe *frame)
   	else
  		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	if (narg > n) {
 		bcopy(params, args, n * sizeof(register_t));
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index dcc30f533c58..6f629d450608 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -560,7 +560,7 @@ syscall(struct trapframe *tf)
   	else
  		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	if (narg <= regcnt) {
 		argp = &tf->tf_out[reg];
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 430b5d6e8837..05667943af72 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -46,9 +46,6 @@ struct sysent {		/* system call table */
 	au_event_t sy_auevent;	/* audit event associated with syscall */
 };
 
-#define SYF_ARGMASK	0x0000FFFF
-#define SYF_MPSAFE	0x00010000
-
 struct image_params;
 struct __sigset;
 struct trapframe;