diff options
| author | peter <peter@FreeBSD.org> | 1997-04-26 11:46:25 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-04-26 11:46:25 +0000 |
| commit | 6323aa10bffe459912ba8b2f8592c7ac4ffd8705 (patch) | |
| tree | bf48960e09e26f0de373de093c89322724bbdd64 /sys/kern/kern_resource.c | |
| parent | 96efe480c0c091aecb2f359675c74aca30f36a4a (diff) | |
| download | FreeBSD-src-6323aa10bffe459912ba8b2f8592c7ac4ffd8705.zip FreeBSD-src-6323aa10bffe459912ba8b2f8592c7ac4ffd8705.tar.gz | |
Man the liferafts! Here comes the long awaited SMP -> -current merge!
There are various options documented in i386/conf/LINT, there is more to
come over the next few days.
The kernel should run pretty much "as before" without the options to
activate SMP mode.
There are a handful of known "loose ends" that need to be fixed, but
have been put off since the SMP kernel is in a moderately good condition
at the moment.
This commit is the result of the tinkering and testing over the last 14
months by many people. A special thanks to Steve Passe for implementing
the APIC code!
Diffstat (limited to 'sys/kern/kern_resource.c')
| -rw-r--r-- | sys/kern/kern_resource.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index fe50cf9..58bdd39 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $Id$ + * $Id: kern_resource.c,v 1.24 1997/02/22 09:39:09 peter Exp $ */ #include "opt_rlimit.h" @@ -498,7 +498,7 @@ calcru(p, up, sp, ip) sec = p->p_rtime.tv_sec; usec = p->p_rtime.tv_usec; - if (p == curproc) { + if (p == curproc) { /* XXX what if it's running on another cpu?? */ /* * Adjust for the current time slice. This is actually fairly * important since the error here is on the order of a time @@ -510,8 +510,10 @@ calcru(p, up, sp, ip) } totusec = (quad_t)sec * 1000000 + usec; if (totusec < 0) { +#ifndef SMP /* sigh, microtime and fork/exit madness here */ /* XXX no %qd in kernel. Truncate. */ printf("calcru: negative time: %ld usec\n", (long)totusec); +#endif totusec = 0; } u = totusec; |
