summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/usermode/dev/clock.c29
1 files changed, 5 insertions, 24 deletions
diff --git a/sys/arch/usermode/dev/clock.c b/sys/arch/usermode/dev/clock.c
index 7db94e1682b..6a144de304f 100644
--- a/sys/arch/usermode/dev/clock.c
+++ b/sys/arch/usermode/dev/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.23 2011/12/15 03:42:32 jmcneill Exp $ */
+/* $NetBSD: clock.c,v 1.24 2012/01/14 21:24:52 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_hz.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.23 2011/12/15 03:42:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.24 2012/01/14 21:24:52 reinoud Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.23 2011/12/15 03:42:32 jmcneill Exp $");
static int clock_match(device_t, cfdata_t, void *);
static void clock_attach(device_t, device_t, void *);
-static void clock(void);
static void clock_signal(int sig, siginfo_t *info, void *ctx);
static unsigned int clock_getcounter(struct timecounter *);
@@ -124,35 +123,17 @@ clock_intr(void *priv)
while (nticks-- > 0) {
hardclock(&cf);
- };
+ }
}
static void
-clock(void)
+clock_signal(int sig, siginfo_t *info, void *ctx)
{
curcpu()->ci_idepth++;
- spl_intr(IPL_SOFTCLOCK, clock_intr, NULL);
+ spl_intr(IPL_CLOCK, clock_intr, NULL);
curcpu()->ci_idepth--;
}
-static void
-clock_signal(int sig, siginfo_t *info, void *ctx)
-{
-#if 0
- ucontext_t *uct = ctx;
- struct lwp *l;
- struct pcb *pcb;
-
- l = curlwp;
- pcb = lwp_getpcb(l);
-
- /* copy this state as where the lwp was XXX NEEDED? */
- memcpy(&pcb->pcb_ucp, uct, sizeof(ucontext_t));
-#endif
-
- clock();
-}
-
static unsigned int
clock_getcounter(struct timecounter *tc)
{
Proposedad 2007-03-18Change all the NETBSD32PTR64(SCARG(uap, xxx))) to SCARG_P32(uap, xxx).dsl 2007-02-09Merge newlock2 to head.ad 2006-09-23Add sysctl tracing to emulations.manu 2005-12-11merge ktrace-lwp.christos 2005-08-19Fix lossage I created with the 64 bit ino_t change.christos 2005-07-03Constify machine32 and machine_arch32.cube 2005-07-03Make COMPAT_NETBSD32 emulate hw.machine. While it might seem wrong to docube 2005-06-22Also fix (wrt the new const stuff) the one user of sysctl_locate()atatat 2005-06-20Change the rest of the sysctl subsystem to use const consistently.atatat 2004-04-27Be consistent about using sysc_init_field()atatat 2004-03-24Tango on sysctl_createv() and flags. The flags have all been renamed,atatat 2004-03-09I obviously put this (__SYSCTL_PRIVATE) here, but I have noatatat 2003-12-04Dynamic sysctl.atatat 2003-10-21Fix some int vs. NULL comparisons.fvdl 2003-06-29Back out the lwp/ktrace changes. They contained a lot of colateral damage,fvdl 2003-06-29struct proc * -> struct lwp *martin 2003-01-18Merge the nathanw_sa branch.thorpej 2002-10-23In preparation for COMPAT_NETBSD32 on SH-5:scw 2002-06-14Provide the correct architecture for HW_MACHINE_ARCH so things likeeeh 2002-02-14allow writing to write-only mappings. fixes PR 3493.chs 2001-11-13add RCSIDs (including regeneration of files as appropriate)lukem 2001-05-30use _KERNEL_OPT.mrg 2001-03-15eliminate the KERN_* error codes in favor of the traditional E* codes.chs 2001-02-08split up netbsd32_netbsd.c into 9 new files, leaving only those syscalls thatmrg