Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/jmcneill-usbmp]: src/sys sync to -current.
details: https://anonhg.NetBSD.org/src/rev/cad04f99cc48
branches: jmcneill-usbmp
changeset: 771811:cad04f99cc48
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Feb 24 09:11:25 2012 +0000
description:
sync to -current.
diffstat:
sys/arch/acorn26/acorn26/vm_machdep.c | 22 +-
sys/arch/acorn32/include/vmparam.h | 8 +-
sys/arch/alpha/alpha/locore.s | 14 +-
sys/arch/alpha/alpha/machdep.c | 25 +-
sys/arch/alpha/alpha/syscall.c | 20 +-
sys/arch/alpha/alpha/trap.c | 27 +-
sys/arch/alpha/alpha/vm_machdep.c | 22 +-
sys/arch/amd64/amd64/db_machdep.c | 7 +-
sys/arch/amd64/amd64/machdep.c | 46 +-
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/amd64/include/pmap.h | 31 +-
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/arm/iomd/iomd_clock.c | 15 +-
sys/arch/atari/atari/atari_init.c | 5 +-
sys/arch/atari/atari/trap.c | 13 +-
sys/arch/cats/include/vmparam.h | 12 +-
sys/arch/cesfic/cesfic/trap.c | 13 +-
sys/arch/evbarm/include/vmparam.h | 8 +-
sys/arch/hp300/hp300/trap.c | 13 +-
sys/arch/hp700/gsc/harmony.c | 14 +-
sys/arch/hp700/hp700/disksubr.c | 6 +-
sys/arch/hp700/hp700/machdep.c | 8 +-
sys/arch/hp700/hp700/machdep.h | 4 +-
sys/arch/hp700/hp700/mainbus.c | 228 +-
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 | 49 +-
sys/arch/i386/i386/trap.c | 22 +-
sys/arch/i386/include/frame.h | 15 +-
sys/arch/i386/include/pmap.h | 77 +-
sys/arch/i386/include/vmparam.h | 4 +-
sys/arch/ia64/ia64/machdep.c | 10 +-
sys/arch/ia64/ia64/trap.c | 13 +-
sys/arch/iyonix/include/vmparam.h | 6 +-
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/mac68k/obio/esp.c | 6 +-
sys/arch/macppc/stand/ofwboot/boot.c | 4 +-
sys/arch/macppc/stand/ofwboot/boot.h | 1 +
sys/arch/macppc/stand/ofwboot/ofdev.c | 5 +-
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/netwinder/include/vmparam.h | 12 +-
sys/arch/news68k/news68k/trap.c | 13 +-
sys/arch/next68k/next68k/trap.c | 13 +-
sys/arch/powerpc/booke/dev/pq3etsec.c | 39 +-
sys/arch/powerpc/booke/dev/pq3sdhc.c | 128 +-
sys/arch/powerpc/booke/trap.c | 20 +-
sys/arch/powerpc/ibm4xx/trap.c | 26 +-
sys/arch/powerpc/include/frame.h | 10 +-
sys/arch/powerpc/include/vmparam.h | 11 +-
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/prep/pnpbus/nvram_pnpbus.c | 15 +-
sys/arch/sandpoint/conf/ENCPP1 | 5 +-
sys/arch/sandpoint/conf/GENERIC | 6 +-
sys/arch/sandpoint/conf/SANDPOINT | 5 +-
sys/arch/sandpoint/sandpoint/satmgr.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/shark/include/vmparam.h | 8 +-
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/conf/files.sparc64 | 3 +-
sys/arch/sparc64/sparc64/db_interface.c | 191 +-
sys/arch/sparc64/sparc64/db_machdep.c | 228 +
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/identcpu.c | 5 +-
sys/arch/x86/x86/linux_trap.c | 6 +-
sys/arch/x86/x86/pmap.c | 63 +-
sys/arch/x86/x86/syscall.c | 21 +-
sys/arch/x86/x86/vm_machdep.c | 25 +-
sys/arch/xen/x86/cpu.c | 81 +-
sys/arch/xen/x86/x86_xpmap.c | 10 +-
sys/arch/xen/xen/if_xennet_xenbus.c | 141 +-
sys/arch/xen/xen/xbd_xenbus.c | 28 +-
sys/arch/xen/xen/xengnt.c | 27 +-
sys/arch/zaurus/include/vmparam.h | 6 +-
sys/compat/aoutm68k/aoutm68k_exec.c | 5 +-
sys/compat/common/Makefile | 5 +-
sys/compat/common/kern_sa_60.c | 84 +
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/arch/powerpc/linux_exec_powerpc.c | 13 +-
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/netbsd32/syscalls.master | 17 +-
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/dev/audio.c | 6 +-
sys/dev/cardbus/if_ral_cardbus.c | 13 +-
sys/dev/i2c/ds1307.c | 371 ++-
sys/dev/i2c/ds1307reg.h | 71 +-
sys/dev/ic/rt2560.c | 92 +-
sys/dev/ic/rt2560var.h | 4 +-
sys/dev/ic/rt2661.c | 102 +-
sys/dev/ic/rt2661var.h | 4 +-
sys/dev/mm.c | 6 +-
sys/dev/pci/if_bce.c | 55 +-
sys/dev/pci/if_ral_pci.c | 9 +-
sys/dev/pci/n8/helper.h | 12 +-
sys/dev/pci/voyager/files.voyager | 2 +-
sys/dev/pci/voyager/pwmclock.c | 64 +-
sys/dev/pci/voyager/voyagerfb.c | 36 +-
sys/dev/raidframe/rf_reconmap.c | 12 +-
sys/dev/raidframe/rf_reconstruct.c | 66 +-
sys/dev/sdmmc/sdhc.c | 685 +++-
sys/dev/usb/hid.c | 6 +-
sys/dev/usb/if_axe.c | 9 +-
sys/dev/usb/if_cdce.c | 7 +-
sys/dev/usb/if_cue.c | 47 +-
sys/dev/usb/if_udav.c | 6 +-
sys/dev/usb/uaudio.c | 8 +-
sys/dev/usb/ubsa.c | 16 +-
sys/dev/usb/ubsa_common.c | 11 +-
sys/dev/usb/ucom.c | 14 +-
sys/dev/usb/ugen.c | 72 +-
sys/dev/usb/uhcivar.h | 9 +-
sys/dev/usb/uhid.c | 10 +-
sys/dev/usb/ukbd.c | 18 +-
sys/dev/usb/ukyopon.c | 7 +-
sys/dev/usb/ulpt.c | 89 +-
sys/dev/usb/umass.c | 110 +-
sys/dev/usb/umass_scsipi.c | 5 +-
sys/dev/usb/umodem.c | 7 +-
sys/dev/usb/urio.c | 67 +-
sys/dev/usb/usb_mem.c | 8 +-
sys/dev/usb/usb_mem.h | 38 +-
sys/dev/usb/usbdevs | 6 +-
sys/dev/usb/usbdevs.h | 8 +-
sys/dev/usb/usbdevs_data.h | 16 +-
sys/dev/usb/usbdi.h | 6 +-
sys/dev/usb/uscanner.c | 82 +-
sys/dev/usb/usscanner.c | 5 +-
sys/dev/usb/uvscom.c | 27 +-
sys/external/bsd/acpica/dist/include/acapps.h | 9 +-
sys/kern/init_main.c | 11 +-
sys/kern/init_sysctl.c | 22 +-
sys/kern/init_sysent.c | 32 +-
sys/kern/kern_exec.c | 237 +-
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_runq.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_tc.c | 8 +-
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/kern/syscalls.c | 18 +-
sys/kern/syscalls.conf | 4 +-
sys/kern/syscalls.master | 17 +-
sys/modules/compat_netbsd32/Makefile | 6 +-
sys/net/npf/npf.c | 20 +-
sys/net/npf/npf_alg.c | 7 +-
sys/net/npf/npf_alg_icmp.c | 5 +-
sys/net/npf/npf_ctl.c | 13 +-
sys/net/npf/npf_handler.c | 64 +-
sys/net/npf/npf_impl.h | 11 +-
sys/net/npf/npf_inet.c | 6 +-
sys/net/npf/npf_instr.c | 6 +-
sys/net/npf/npf_log.c | 6 +-
sys/net/npf/npf_nat.c | 6 +-
sys/net/npf/npf_processor.c | 9 +-
sys/net/npf/npf_rproc.c | 9 +-
sys/net/npf/npf_ruleset.c | 12 +-
sys/net/npf/npf_sendpkt.c | 6 +-
sys/net/npf/npf_session.c | 27 +-
sys/net/npf/npf_tableset.c | 6 +-
sys/net/route.h | 3 +-
sys/rump/librump/rumpkern/opt/opt_sa.h | 1 -
sys/rump/librump/rumpkern/vm.c | 10 +-
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/syscall.h | 28 +-
sys/sys/syscallargs.h | 52 +-
sys/sys/timevar.h | 6 +-
sys/sys/ucontext.h | 3 +-
sys/sys/userret.h | 9 +-
sys/ufs/lfs/lfs_extern.h | 5 +-
sys/uvm/uvm_fault.c | 6 +-
sys/uvm/uvm_fault_i.h | 13 +-
sys/uvm/uvm_glue.c | 9 +-
sys/uvm/uvm_km.c | 59 +-
sys/uvm/uvm_kmguard.c | 5 +-
sys/uvm/uvm_loan.c | 5 +-
sys/uvm/uvm_map.c | 78 +-
sys/uvm/uvm_map.h | 6 +-
sys/uvm/uvm_param.h | 11 +-
268 files changed, 2835 insertions(+), 8252 deletions(-)
diffs (truncated from 21408 to 300 lines):
diff -r 91466c16bde6 -r cad04f99cc48 sys/arch/acorn26/acorn26/vm_machdep.c
--- a/sys/arch/acorn26/acorn26/vm_machdep.c Fri Feb 24 07:35:00 2012 +0000
+++ b/sys/arch/acorn26/acorn26/vm_machdep.c Fri Feb 24 09:11:25 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.27.8.1 2012/02/24 09:11:25 mrg 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.27.8.1 2012/02/24 09:11:25 mrg 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 91466c16bde6 -r cad04f99cc48 sys/arch/acorn32/include/vmparam.h
--- a/sys/arch/acorn32/include/vmparam.h Fri Feb 24 07:35:00 2012 +0000
+++ b/sys/arch/acorn32/include/vmparam.h Fri Feb 24 09:11:25 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.22.12.1 2012/02/18 07:30:44 mrg Exp $ */
+/* $NetBSD: vmparam.h,v 1.22.12.2 2012/02/24 09:11:25 mrg Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,8 +29,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ARM32_VMPARAM_H_
-#define _ARM32_VMPARAM_H_
+#ifndef _ACORN32_VMPARAM_H_
+#define _ACORN32_VMPARAM_H_
#if defined(_KERNEL) || defined(_KMEMUSER)
@@ -90,4 +90,4 @@
#endif /* _KERNEL || _KMEMUSER */
-#endif /* _ARM32_VMPARAM_H_ */
+#endif /* _ACORN32_VMPARAM_H_ */
diff -r 91466c16bde6 -r cad04f99cc48 sys/arch/alpha/alpha/locore.s
--- a/sys/arch/alpha/alpha/locore.s Fri Feb 24 07:35:00 2012 +0000
+++ b/sys/arch/alpha/alpha/locore.s Fri Feb 24 09:11:25 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.121.6.1 2012/02/24 09:11:25 mrg 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.121.6.1 2012/02/24 09:11:25 mrg 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 91466c16bde6 -r cad04f99cc48 sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c Fri Feb 24 07:35:00 2012 +0000
+++ b/sys/arch/alpha/alpha/machdep.c Fri Feb 24 09:11:25 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.335.6.1 2012/02/18 07:30:50 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.335.6.2 2012/02/24 09:11:26 mrg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.335.6.1 2012/02/18 07:30:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.335.6.2 2012/02/24 09:11:26 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,8 +77,6 @@
#include <sys/cpu.h>
#include <sys/proc.h>
#include <sys/ras.h>
-#include <sys/sa.h>
-#include <sys/savar.h>
#include <sys/sched.h>
#include <sys/reboot.h>
#include <sys/device.h>
@@ -1528,25 +1526,6 @@
#endif
}
-
-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_tf;
-
- tf->tf_regs[FRAME_PC] = (uint64_t)upcall;
- tf->tf_regs[FRAME_RA] = 0;
- tf->tf_regs[FRAME_A0] = type;
- tf->tf_regs[FRAME_A1] = (uint64_t)sas;
- tf->tf_regs[FRAME_A2] = nevents;
- tf->tf_regs[FRAME_A3] = ninterrupted;
- tf->tf_regs[FRAME_A4] = (uint64_t)ap;
- tf->tf_regs[FRAME_T12] = (uint64_t)upcall; /* t12 is pv */
- alpha_pal_wrusp((unsigned long)sp);
-}
-
/*
* machine dependent system variables.
*/
diff -r 91466c16bde6 -r cad04f99cc48 sys/arch/alpha/alpha/syscall.c
--- a/sys/arch/alpha/alpha/syscall.c Fri Feb 24 07:35:00 2012 +0000
+++ b/sys/arch/alpha/alpha/syscall.c Fri Feb 24 09:11:25 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.37.12.1 2012/02/18 07:30:54 mrg Exp $ */
+/* $NetBSD: syscall.c,v 1.37.12.2 2012/02/24 09:11:26 mrg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -89,15 +89,11 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37.12.1 2012/02/18 07:30:54 mrg Exp $");
-
-#include "opt_sa.h"
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37.12.2 2012/02/24 09:11:26 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/sa.h>
-#include <sys/savar.h>
#include <sys/signal.h>
#include <sys/syscall.h>
#include <sys/syscallvar.h>
@@ -151,12 +147,6 @@
callp = p->p_emul->e_sysent;
-#ifdef KERN_SA
- if (__predict_false((l->l_savp)
- && (l->l_savp->savp_pflags & SAVP_FLAG_DELIVERING)))
- l->l_savp->savp_pflags &= ~SAVP_FLAG_DELIVERING;
-#endif
-
switch (code) {
case SYS_syscall:
case SYS___syscall:
@@ -245,12 +235,6 @@
callp = p->p_emul->e_sysent;
-#ifdef KERN_SA
- if (__predict_false((l->l_savp)
- && (l->l_savp->savp_pflags & SAVP_FLAG_DELIVERING)))
- l->l_savp->savp_pflags &= ~SAVP_FLAG_DELIVERING;
-#endif
-
switch (code) {
case SYS_syscall:
case SYS___syscall:
diff -r 91466c16bde6 -r cad04f99cc48 sys/arch/alpha/alpha/trap.c
--- a/sys/arch/alpha/alpha/trap.c Fri Feb 24 07:35:00 2012 +0000
+++ b/sys/arch/alpha/alpha/trap.c Fri Feb 24 09:11:25 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.126.6.1 2012/02/18 07:30:54 mrg Exp $ */
+/* $NetBSD: trap.c,v 1.126.6.2 2012/02/24 09:11:26 mrg 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.126.6.1 2012/02/18 07:30:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.126.6.2 2012/02/24 09:11:26 mrg 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 91466c16bde6 -r cad04f99cc48 sys/arch/alpha/alpha/vm_machdep.c
--- a/sys/arch/alpha/alpha/vm_machdep.c Fri Feb 24 07:35:00 2012 +0000
+++ b/sys/arch/alpha/alpha/vm_machdep.c Fri Feb 24 09:11:25 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.108.6.1 2012/02/18 07:30:54 mrg Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.108.6.2 2012/02/24 09:11:26 mrg Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
Home |
Main Index |
Thread Index |
Old Index