diff --git a/sys/compat/linux/arch/alpha/linux_machdep.c b/sys/compat/linux/arch/alpha/linux_machdep.c index ca19228a5c16..224c6d2fd16c 100644 --- a/sys/compat/linux/arch/alpha/linux_machdep.c +++ b/sys/compat/linux/arch/alpha/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.29 2003/09/26 12:02:57 simonb Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.30 2003/10/10 02:26:54 matt Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.29 2003/09/26 12:02:57 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.30 2003/10/10 02:26:54 matt Exp $"); #include #include @@ -118,10 +118,8 @@ linux_setregs(l, epp, stack) #endif } -void setup_linux_rt_sigframe(tf, sig, mask) - struct trapframe *tf; - int sig; - sigset_t *mask; +void +setup_linux_rt_sigframe(struct trapframe *tf, int sig, const sigset_t *mask) { struct lwp *l = curlwp; struct proc *p = l->l_proc; @@ -155,7 +153,7 @@ void setup_linux_rt_sigframe(tf, sig, mask) /* * Build the signal context to be used by sigreturn. */ - bzero(&sigframe.uc, sizeof(struct linux_ucontext)); + memset(&sigframe.uc, 0, sizeof(struct linux_ucontext)); sigframe.uc.uc_mcontext.sc_onstack = onstack; /* Setup potentially partial signal mask in sc_mask. */ @@ -183,7 +181,7 @@ void setup_linux_rt_sigframe(tf, sig, mask) * XXX Or we do the emuldata thing. * XXX -erh */ - bzero(&sigframe.info, sizeof(struct linux_siginfo)); + memset(&sigframe.info, 0, sizeof(struct linux_siginfo)); sigframe.info.lsi_signo = sig; sigframe.info.lsi_code = LINUX_SI_USER; sigframe.info.lsi_pid = p->p_pid; @@ -256,7 +254,7 @@ void setup_linux_sigframe(tf, sig, mask) /* * Build the signal context to be used by sigreturn. */ - bzero(&sigframe.sf_sc, sizeof(struct linux_ucontext)); + memset(&sigframe.sf_sc, 0, sizeof(struct linux_ucontext)); sigframe.sf_sc.sc_onstack = onstack; native_to_linux_old_sigset(&sigframe.sf_sc.sc_mask, mask); sigframe.sf_sc.sc_pc = tf->tf_regs[FRAME_PC]; @@ -318,14 +316,12 @@ void setup_linux_sigframe(tf, sig, mask) * specified pc, psl. */ void -linux_sendsig(sig, mask, code) - int sig; - const sigset_t *mask; - u_long code; +linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) { struct lwp *l = curlwp; struct proc *p = l->l_proc; struct trapframe *tf = l->l_md.md_tf; + const int sig = ksi->ksi_signo; sig_t catcher = SIGACTION(p, sig).sa_handler; #ifdef notyet struct linux_emuldata *edp;