follow the sa removal for alpha

This commit is contained in:
para 2012-02-21 17:39:17 +00:00
parent 1e37a35ef0
commit 92fedce1d6
2 changed files with 4 additions and 41 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.337 2012/02/06 02:14:11 matt Exp $ */
/* $NetBSD: machdep.c,v 1.338 2012/02/21 17:39:17 para 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.337 2012/02/06 02:14:11 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.338 2012/02/21 17:39:17 para Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -77,8 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.337 2012/02/06 02:14:11 matt Exp $");
#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 @@ sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
#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.
*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: syscall.c,v 1.39 2012/02/11 23:16:15 martin Exp $ */
/* $NetBSD: syscall.c,v 1.40 2012/02/21 17:39:17 para 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.39 2012/02/11 23:16:15 martin Exp $");
#include "opt_sa.h"
__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.40 2012/02/21 17:39:17 para 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 @@ syscall_plain(struct lwp *l, uint64_t code, struct trapframe *framep)
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 @@ syscall_fancy(struct lwp *l, uint64_t code, struct trapframe *framep)
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: