Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove COMPAT_SA / KERN_SA. Welcome to 6.99.3!
details: https://anonhg.NetBSD.org/src/rev/559869b45bdf
branches: trunk
changeset: 777471:559869b45bdf
user: rmind <rmind%NetBSD.org@localhost>
date: Sun Feb 19 21:05:51 2012 +0000
description:
Remove COMPAT_SA / KERN_SA. Welcome to 6.99.3!
Approved by core@.
diffstat:
distrib/sets/lists/comp/mi | 6 +-
sys/arch/acorn26/acorn26/vm_machdep.c | 22 +-
sys/arch/alpha/alpha/locore.s | 14 +-
sys/arch/alpha/alpha/trap.c | 27 +-
sys/arch/alpha/alpha/vm_machdep.c | 22 +-
sys/arch/amd64/amd64/machdep.c | 39 +-
sys/arch/amd64/amd64/netbsd32_machdep.c | 42 +-
sys/arch/amd64/amd64/trap.c | 22 +-
sys/arch/amd64/include/netbsd32_machdep.h | 11 +-
sys/arch/amiga/amiga/trap.c | 15 +-
sys/arch/arm/arm/arm_machdep.c | 64 +-
sys/arch/arm/arm/syscall.c | 13 +-
sys/arch/arm/arm32/fault.c | 34 +-
sys/arch/arm/arm32/vm_machdep.c | 26 +-
sys/arch/arm/include/frame.h | 18 +-
sys/arch/atari/atari/trap.c | 13 +-
sys/arch/cesfic/cesfic/trap.c | 13 +-
sys/arch/hp300/hp300/trap.c | 13 +-
sys/arch/hppa/hppa/hppa_machdep.c | 87 +-
sys/arch/hppa/hppa/trap.c | 30 +-
sys/arch/hppa/hppa/vm_machdep.c | 42 +-
sys/arch/i386/i386/machdep.c | 44 +-
sys/arch/i386/i386/trap.c | 22 +-
sys/arch/i386/include/frame.h | 15 +-
sys/arch/ia64/ia64/machdep.c | 10 +-
sys/arch/ia64/ia64/trap.c | 13 +-
sys/arch/luna68k/luna68k/trap.c | 13 +-
sys/arch/m68k/include/m68k.h | 3 +-
sys/arch/m68k/include/saframe.h | 53 -
sys/arch/m68k/m68k/m68k_syscall.c | 24 +-
sys/arch/m68k/m68k/sig_machdep.c | 37 +-
sys/arch/m68k/m68k/switch_subr.s | 15 +-
sys/arch/m68k/m68k/vm_machdep.c | 17 +-
sys/arch/mac68k/mac68k/trap.c | 13 +-
sys/arch/mips/include/frame.h | 18 +-
sys/arch/mips/include/locore.h | 3 +-
sys/arch/mips/include/netbsd32_machdep.h | 17 +-
sys/arch/mips/mips/cpu_subr.c | 78 +-
sys/arch/mips/mips/locore_mips1.S | 19 +-
sys/arch/mips/mips/mipsX_subr.S | 22 +-
sys/arch/mips/mips/mips_machdep.c | 6 +-
sys/arch/mips/mips/netbsd32_machdep.c | 5 +-
sys/arch/mips/mips/syscall.c | 16 +-
sys/arch/mips/mips/trap.c | 12 +-
sys/arch/mips/mips/vm_machdep.c | 32 +-
sys/arch/mvme68k/mvme68k/trap.c | 13 +-
sys/arch/news68k/news68k/trap.c | 13 +-
sys/arch/next68k/next68k/trap.c | 13 +-
sys/arch/powerpc/booke/trap.c | 20 +-
sys/arch/powerpc/ibm4xx/trap.c | 26 +-
sys/arch/powerpc/include/frame.h | 10 +-
sys/arch/powerpc/powerpc/locore_subr.S | 9 +-
sys/arch/powerpc/powerpc/powerpc_machdep.c | 35 +-
sys/arch/powerpc/powerpc/syscall.c | 19 +-
sys/arch/powerpc/powerpc/trap.c | 24 +-
sys/arch/powerpc/powerpc/vm_machdep.c | 22 +-
sys/arch/sh3/include/frame.h | 15 +-
sys/arch/sh3/sh3/exception.c | 17 +-
sys/arch/sh3/sh3/sh3_machdep.c | 47 +-
sys/arch/sh3/sh3/syscall.c | 22 +-
sys/arch/sh3/sh3/vm_machdep.c | 26 +-
sys/arch/sparc/include/cpu.h | 3 +-
sys/arch/sparc/sparc/locore.s | 6 +-
sys/arch/sparc/sparc/machdep.c | 42 +-
sys/arch/sparc/sparc/syscall.c | 19 +-
sys/arch/sparc/sparc/trap.c | 39 +-
sys/arch/sparc/sparc/vm_machdep.c | 22 +-
sys/arch/sparc64/sparc64/locore.s | 12 +-
sys/arch/sparc64/sparc64/machdep.c | 47 +-
sys/arch/sparc64/sparc64/netbsd32_machdep.c | 46 +-
sys/arch/sparc64/sparc64/syscall.c | 27 +-
sys/arch/sparc64/sparc64/trap.c | 17 +-
sys/arch/sparc64/sparc64/vm_machdep.c | 19 +-
sys/arch/sun2/sun2/trap.c | 14 +-
sys/arch/sun3/sun3/trap.c | 14 +-
sys/arch/vax/vax/machdep.c | 51 +-
sys/arch/vax/vax/syscall.c | 13 +-
sys/arch/vax/vax/trap.c | 23 +-
sys/arch/vax/vax/vm_machdep.c | 31 +-
sys/arch/x68k/x68k/trap.c | 13 +-
sys/arch/x86/x86/linux_trap.c | 6 +-
sys/arch/x86/x86/syscall.c | 21 +-
sys/arch/x86/x86/vm_machdep.c | 25 +-
sys/compat/aoutm68k/aoutm68k_exec.c | 5 +-
sys/compat/common/kern_sig_16.c | 10 +-
sys/compat/freebsd/freebsd_exec.c | 5 +-
sys/compat/ibcs2/ibcs2_exec.c | 5 +-
sys/compat/linux/common/linux_exec.c | 5 +-
sys/compat/linux32/common/linux32_exec.c | 5 +-
sys/compat/netbsd32/files.netbsd32 | 3 +-
sys/compat/netbsd32/netbsd32.h | 9 +-
sys/compat/netbsd32/netbsd32_netbsd.c | 13 +-
sys/compat/netbsd32/netbsd32_sa.c | 250 --
sys/compat/netbsd32/netbsd32_sa.h | 54 -
sys/compat/netbsd32/netbsd32_signal.c | 52 +-
sys/compat/netbsd32/netbsd32_syscall.h | 26 +-
sys/compat/netbsd32/netbsd32_syscallargs.h | 38 +-
sys/compat/netbsd32/netbsd32_syscalls.c | 16 +-
sys/compat/netbsd32/netbsd32_sysent.c | 24 +-
sys/compat/osf1/osf1_exec.c | 5 +-
sys/compat/sa/compat_sa.c | 2599 ---------------------------
sys/compat/sunos/sunos_exec.c | 5 +-
sys/compat/sunos32/sunos32_exec.c | 5 +-
sys/compat/svr4/svr4_exec.c | 5 +-
sys/compat/svr4_32/svr4_32_exec.c | 5 +-
sys/compat/ultrix/ultrix_misc.c | 5 +-
sys/conf/files | 6 +-
sys/kern/init_main.c | 11 +-
sys/kern/init_sysctl.c | 22 +-
sys/kern/kern_exec.c | 45 +-
sys/kern/kern_exit.c | 67 +-
sys/kern/kern_ktrace.c | 43 +-
sys/kern/kern_lwp.c | 38 +-
sys/kern/kern_mutex.c | 23 +-
sys/kern/kern_proc.c | 7 +-
sys/kern/kern_ras.c | 6 +-
sys/kern/kern_sig.c | 222 +--
sys/kern/kern_sleepq.c | 25 +-
sys/kern/kern_stub.c | 13 +-
sys/kern/kern_synch.c | 33 +-
sys/kern/kern_time.c | 120 +-
sys/kern/sys_lwp.c | 23 +-
sys/kern/sys_sched.c | 22 +-
sys/kern/sys_sig.c | 78 +-
sys/modules/compat_netbsd32/Makefile | 6 +-
sys/rump/librump/rumpkern/opt/opt_sa.h | 1 -
sys/sys/Makefile | 4 +-
sys/sys/ktrace.h | 13 +-
sys/sys/lwp.h | 24 +-
sys/sys/param.h | 4 +-
sys/sys/proc.h | 12 +-
sys/sys/sa.h | 76 -
sys/sys/satypes.h | 43 -
sys/sys/savar.h | 219 --
sys/sys/signalvar.h | 14 +-
sys/sys/sigtypes.h | 10 +-
sys/sys/sleepq.h | 3 +-
sys/sys/ucontext.h | 3 +-
sys/sys/userret.h | 9 +-
139 files changed, 380 insertions(+), 5935 deletions(-)
diffs (truncated from 10532 to 300 lines):
diff -r 3e36781a1c47 -r 559869b45bdf distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Sun Feb 19 20:20:31 2012 +0000
+++ b/distrib/sets/lists/comp/mi Sun Feb 19 21:05:51 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1740 2012/02/17 09:44:12 plunky Exp $
+# $NetBSD: mi,v 1.1741 2012/02/19 21:05:51 rmind Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2484,8 +2484,8 @@
./usr/include/sys/rmd160.h comp-c-include
./usr/include/sys/rnd.h comp-c-include
./usr/include/sys/rwlock.h comp-c-include
-./usr/include/sys/sa.h comp-c-include
-./usr/include/sys/satypes.h comp-c-include
+./usr/include/sys/sa.h comp-obsolete obsolete
+./usr/include/sys/satypes.h comp-obsolete obsolete
./usr/include/sys/scanio.h comp-c-include
./usr/include/sys/sched.h comp-c-include
./usr/include/sys/scsiio.h comp-c-include
diff -r 3e36781a1c47 -r 559869b45bdf sys/arch/acorn26/acorn26/vm_machdep.c
--- a/sys/arch/acorn26/acorn26/vm_machdep.c Sun Feb 19 20:20:31 2012 +0000
+++ b/sys/arch/acorn26/acorn26/vm_machdep.c Sun Feb 19 21:05:51 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.27 2011/02/10 14:46:45 pooka Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.28 2012/02/19 21:05:58 rmind Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* Following is for vmapbuf/vunmapbuf */
+
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.27 2011/02/10 14:46:45 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.28 2012/02/19 21:05:58 rmind Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -133,22 +133,12 @@
/* Fabricate a new switchframe */
memset(sf, 0, sizeof(*sf));
- cpu_setfunc(l2, func, arg);
-}
-
-void
-cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
-{
- struct pcb *pcb = lwp_getpcb(l);
- struct trapframe *tf = pcb->pcb_tf;
- struct switchframe *sf = (struct switchframe *)tf - 1;
-
sf->sf_r13 = (register_t)tf; /* Initial stack pointer */
sf->sf_pc = (register_t)lwp_trampoline | R15_MODE_SVC;
- pcb->pcb_tf = tf;
- pcb->pcb_sf = sf;
- pcb->pcb_onfault = NULL;
+ pcb2->pcb_tf = tf;
+ pcb2->pcb_sf = sf;
+ pcb2->pcb_onfault = NULL;
sf->sf_r4 = (register_t)func;
sf->sf_r5 = (register_t)arg;
}
diff -r 3e36781a1c47 -r 559869b45bdf sys/arch/alpha/alpha/locore.s
--- a/sys/arch/alpha/alpha/locore.s Sun Feb 19 20:20:31 2012 +0000
+++ b/sys/arch/alpha/alpha/locore.s Sun Feb 19 21:05:51 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.121 2011/06/07 00:48:30 matt Exp $ */
+/* $NetBSD: locore.s,v 1.122 2012/02/19 21:05:58 rmind Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.121 2011/06/07 00:48:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.122 2012/02/19 21:05:58 rmind Exp $");
#include "assym.h"
@@ -744,16 +744,6 @@
jmp zero, (pv)
END(lwp_trampoline)
-/*
- * Simplified version of above: don't call lwp_startup()
- */
-LEAF_NOPROFILE(setfunc_trampoline, 0)
- mov s0, pv
- mov s1, ra
- mov s2, a0
- jmp zero, (pv)
- END(setfunc_trampoline)
-
/**************************************************************************/
/*
diff -r 3e36781a1c47 -r 559869b45bdf sys/arch/alpha/alpha/trap.c
--- a/sys/arch/alpha/alpha/trap.c Sun Feb 19 20:20:31 2012 +0000
+++ b/sys/arch/alpha/alpha/trap.c Sun Feb 19 21:05:51 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.127 2012/02/06 02:14:12 matt Exp $ */
+/* $NetBSD: trap.c,v 1.128 2012/02/19 21:05:59 rmind Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -93,13 +93,11 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.127 2012/02/06 02:14:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.128 2012/02/19 21:05:59 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/sa.h>
-#include <sys/savar.h>
#include <sys/syscall.h>
#include <sys/buf.h>
#include <sys/kauth.h>
@@ -407,12 +405,7 @@
#endif
}
- if (user) {
- if (l->l_flag & LW_SA) {
- l->l_savp->savp_faultaddr = (vaddr_t)a0;
- l->l_pflag |= LP_SA_PAGEFAULT;
- }
- } else {
+ if (!user) {
struct cpu_info *ci = curcpu();
if (l == NULL) {
@@ -488,8 +481,6 @@
rv = EFAULT;
}
if (rv == 0) {
- if (user)
- l->l_pflag &= ~LP_SA_PAGEFAULT;
goto out;
}
@@ -518,7 +509,6 @@
ksi.ksi_code = SEGV_ACCERR;
else
ksi.ksi_code = SEGV_MAPERR;
- l->l_pflag &= ~LP_SA_PAGEFAULT;
break;
}
@@ -1145,14 +1135,3 @@
kmem_free(uc, sizeof(ucontext_t));
userret(l);
}
-
-/*
- * XXX This is a terrible name.
- */
-void
-upcallret(struct lwp *l)
-{
- KERNEL_UNLOCK_LAST(l);
-
- userret(l);
-}
diff -r 3e36781a1c47 -r 559869b45bdf sys/arch/alpha/alpha/vm_machdep.c
--- a/sys/arch/alpha/alpha/vm_machdep.c Sun Feb 19 20:20:31 2012 +0000
+++ b/sys/arch/alpha/alpha/vm_machdep.c Sun Feb 19 21:05:51 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.111 2012/02/06 02:14:12 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.112 2012/02/19 21:06:00 rmind Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.111 2012/02/06 02:14:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.112 2012/02/19 21:06:00 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -159,24 +159,6 @@
}
}
-void
-cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
-{
- struct pcb *pcb = lwp_getpcb(l);
- extern void setfunc_trampoline(void);
-
- pcb->pcb_hw.apcb_ksp =
- (uint64_t)l->l_md.md_tf;
- pcb->pcb_context[0] =
- (uint64_t)func; /* s0: pc */
- pcb->pcb_context[1] =
- (uint64_t)exception_return; /* s1: ra */
- pcb->pcb_context[2] =
- (uint64_t)arg; /* s2: arg */
- pcb->pcb_context[7] =
- (uint64_t)setfunc_trampoline; /* ra: assembly magic */
-}
-
/*
* Map a user I/O request into kernel virtual address space.
* Note: the pages are already locked by uvm_vslock(), so we
diff -r 3e36781a1c47 -r 559869b45bdf sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c Sun Feb 19 20:20:31 2012 +0000
+++ b/sys/arch/amd64/amd64/machdep.c Sun Feb 19 21:05:51 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.175 2012/01/27 19:48:38 para Exp $ */
+/* $NetBSD: machdep.c,v 1.176 2012/02/19 21:06:00 rmind Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175 2012/01/27 19:48:38 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.176 2012/02/19 21:06:00 rmind Exp $");
/* #define XENDEBUG_LOW */
@@ -147,8 +147,6 @@
#include <sys/ucontext.h>
#include <machine/kcore.h>
#include <sys/ras.h>
-#include <sys/sa.h>
-#include <sys/savar.h>
#include <sys/syscallargs.h>
#include <sys/ksyms.h>
#include <sys/device.h>
@@ -688,39 +686,6 @@
l->l_sigstk.ss_flags |= SS_ONSTACK;
}
-void
-cpu_upcall(struct lwp *l, int type, int nevents, int ninterrupted, void *sas, void *ap, void *sp, sa_upcall_t upcall)
-{
- struct trapframe *tf;
-
- tf = l->l_md.md_regs;
-
-#if 0
- printf("proc %d: upcall to lwp %d, type %d ev %d int %d sas %p to %p\n",
- (int)l->l_proc->p_pid, (int)l->l_lid, type, nevents, ninterrupted,
- sas, (void *)upcall);
-#endif
-
- tf->tf_rdi = type;
- tf->tf_rsi = (u_int64_t)sas;
- tf->tf_rdx = nevents;
- tf->tf_rcx = ninterrupted;
- tf->tf_r8 = (u_int64_t)ap;
-
- tf->tf_rip = (u_int64_t)upcall;
- tf->tf_rsp = ((unsigned long)sp & ~15) - 8;
- tf->tf_rbp = 0; /* indicate call-frame-top to debuggers */
- tf->tf_gs = GSEL(GUDATA_SEL, SEL_UPL);
- tf->tf_fs = GSEL(GUDATA_SEL, SEL_UPL);
- tf->tf_es = GSEL(GUDATA_SEL, SEL_UPL);
- tf->tf_ds = GSEL(GUDATA_SEL, SEL_UPL);
- tf->tf_cs = GSEL(GUCODE_SEL, SEL_UPL);
- tf->tf_ss = GSEL(GUDATA_SEL, SEL_UPL);
- tf->tf_rflags &= ~(PSL_T|PSL_VM|PSL_AC);
-
- l->l_md.md_flags |= MDP_IRET;
-}
-
int waittime = -1;
struct pcb dumppcb;
diff -r 3e36781a1c47 -r 559869b45bdf sys/arch/amd64/amd64/netbsd32_machdep.c
--- a/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Feb 19 20:20:31 2012 +0000
+++ b/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Feb 19 21:05:51 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.74 2011/03/04 22:25:24 joerg Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.75 2012/02/19 21:06:01 rmind Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
Home |
Main Index |
Thread Index |
Old Index