diff options
| author | jhb <jhb@FreeBSD.org> | 2001-04-10 21:34:13 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-04-10 21:34:13 +0000 |
| commit | ee034b0be21d76a493ce0170922a2953a43bff4a (patch) | |
| tree | 4bb575ed7053b014b0f1d44a23a5563fb0f3cf83 /sys/kern | |
| parent | 7df3e254964ecc5ad934c334cc5366d9e4e20a4b (diff) | |
| download | FreeBSD-src-ee034b0be21d76a493ce0170922a2953a43bff4a.zip FreeBSD-src-ee034b0be21d76a493ce0170922a2953a43bff4a.tar.gz | |
Remove the BETTER_CLOCK #ifdef's. The code is on by default and is here
to stay for the foreseeable future.
OK'd by: peter (the idea)
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_smp.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index ceef075..46a87a5 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -42,9 +42,7 @@ #include <sys/malloc.h> #include <sys/memrange.h> #include <sys/mutex.h> -#ifdef BETTER_CLOCK #include <sys/dkstat.h> -#endif #include <sys/cons.h> /* cngetc() */ #include <vm/vm.h> @@ -52,14 +50,12 @@ #include <vm/pmap.h> #include <vm/vm_kern.h> #include <vm/vm_extern.h> -#ifdef BETTER_CLOCK #include <sys/lock.h> #include <vm/vm_map.h> #include <sys/user.h> #ifdef GPROF #include <sys/gmon.h> #endif -#endif #include <machine/smp.h> #include <machine/apic.h> @@ -631,11 +627,9 @@ mp_enable(u_int boot_addr) setidt(XINVLTLB_OFFSET, Xinvltlb, SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); -#ifdef BETTER_CLOCK /* install an inter-CPU IPI for reading processor state */ setidt(XCPUCHECKSTATE_OFFSET, Xcpucheckstate, SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); -#endif /* install an inter-CPU IPI for all-CPU rendezvous */ setidt(XRENDEZVOUS_OFFSET, Xrendezvous, @@ -2338,8 +2332,6 @@ ap_init(void) panic("scheduler returned us to ap_init"); } -#ifdef BETTER_CLOCK - #define CHECKSTATE_USER 0 #define CHECKSTATE_SYS 1 #define CHECKSTATE_INTR 2 @@ -2505,7 +2497,7 @@ forward_statclock(int pscnt) /* spin */ i++; if (i == 100000) { -#ifdef BETTER_CLOCK_DIAGNOSTIC +#ifdef DIAGNOSTIC printf("forward_statclock: checkstate %x\n", checkstate_probed_cpus); #endif @@ -2534,7 +2526,7 @@ forward_statclock(int pscnt) /* spin */ i++; if (i > 100000) { -#ifdef BETTER_CLOCK_DIAGNOSTIC +#ifdef DIAGNOSTIC printf("forward_statclock: dropped ast 0x%x\n", checkstate_need_ast & map); #endif @@ -2581,7 +2573,7 @@ forward_hardclock(int pscnt) /* spin */ i++; if (i == 100000) { -#ifdef BETTER_CLOCK_DIAGNOSTIC +#ifdef DIAGNOSTIC printf("forward_hardclock: checkstate %x\n", checkstate_probed_cpus); #endif @@ -2628,7 +2620,7 @@ forward_hardclock(int pscnt) /* spin */ i++; if (i > 100000) { -#ifdef BETTER_CLOCK_DIAGNOSTIC +#ifdef DIAGNOSTIC printf("forward_hardclock: dropped ast 0x%x\n", checkstate_need_ast & map); #endif @@ -2638,8 +2630,6 @@ forward_hardclock(int pscnt) } } -#endif /* BETTER_CLOCK */ - void forward_signal(struct proc *p) { |
