diff options
| author | bde <bde@FreeBSD.org> | 2000-10-12 13:02:13 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2000-10-12 13:02:13 +0000 |
| commit | 2c11e813f59806caa1f3dae21d64eecb9c25f0a0 (patch) | |
| tree | 6bf7c3316516d52917c5a2bb5cd1290f56d275a7 | |
| parent | 5cfbdcbbe8875e02a25a22cb7ac692a753aacf37 (diff) | |
| download | FreeBSD-src-2c11e813f59806caa1f3dae21d64eecb9c25f0a0.zip FreeBSD-src-2c11e813f59806caa1f3dae21d64eecb9c25f0a0.tar.gz | |
Moved the declaration of astpending to the correct place.
This shouldn't affect the alpha or ia64, since they don't have a
variable named astpending. The alpha still has 2 declarations of
this nonexistent variable.
| -rw-r--r-- | sys/i386/include/globals.h | 6 | ||||
| -rw-r--r-- | sys/sys/proc.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/i386/include/globals.h b/sys/i386/include/globals.h index d18c0ac..f5479e4 100644 --- a/sys/i386/include/globals.h +++ b/sys/i386/include/globals.h @@ -122,7 +122,11 @@ _global_globaldata(void) #define witness_spin_check GLOBAL_RVALUE(witness_spin_check, int) -#endif /*UP kernel*/ +#else /* !(SMP || KLD_MODULE) */ + +extern u_int astpending; + +#endif /* SMP || KLD_MODULE */ GLOBAL_FUNC(curproc) GLOBAL_FUNC(astpending) diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 03bb2b6..1390d40 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -452,7 +452,6 @@ extern u_long pgrphash; extern struct proc *curproc; /* Current running proc. */ extern struct proc *prevproc; /* Previously running proc. */ extern struct proc *idleproc; /* Current idle proc. */ -extern u_int astpending; /* software interrupt pending */ extern int switchticks; /* `ticks' at last context switch. */ extern struct timeval switchtime; /* Uptime at last context switch */ #endif |
