diff options
| author | dillon <dillon@FreeBSD.org> | 2002-02-26 20:33:41 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 2002-02-26 20:33:41 +0000 |
| commit | 996781f17a00793462f9b311d5f8e7a458679909 (patch) | |
| tree | 7ede0e88befde8b862a573c1bafc540a03a87d83 /sys/isa | |
| parent | 118717618343ff3fc9166354457e2ab28cb86fbe (diff) | |
| download | FreeBSD-src-996781f17a00793462f9b311d5f8e7a458679909.zip FreeBSD-src-996781f17a00793462f9b311d5f8e7a458679909.tar.gz | |
revert last commit temporarily due to whining on the lists.
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/atrtc.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index ee776af..ae56051 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -995,7 +995,6 @@ cpu_initclocks() int apic_8254_trial; void *clkdesc; #endif /* APIC_IO */ - critical_t crit; if (statclock_disable) { /* @@ -1030,11 +1029,9 @@ cpu_initclocks() inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, &clkdesc); - crit = cpu_critical_enter(); mtx_lock_spin(&icu_lock); INTREN(1 << apic_8254_intr); mtx_unlock_spin(&icu_lock); - cpu_critical_exit(crit); #else /* APIC_IO */ @@ -1045,11 +1042,9 @@ cpu_initclocks() */ inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); - crit = cpu_critical_enter(); mtx_lock_spin(&icu_lock); INTREN(IRQ0); mtx_unlock_spin(&icu_lock); - cpu_critical_exit(crit); #endif /* APIC_IO */ @@ -1072,7 +1067,6 @@ cpu_initclocks() inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); - crit = cpu_critical_enter(); mtx_lock_spin(&icu_lock); #ifdef APIC_IO INTREN(APIC_IRQ8); @@ -1080,7 +1074,6 @@ cpu_initclocks() INTREN(IRQ8); #endif /* APIC_IO */ mtx_unlock_spin(&icu_lock); - cpu_critical_exit(crit); writertc(RTC_STATUSB, rtc_statusb); @@ -1097,13 +1090,9 @@ cpu_initclocks() * on the IO APIC. * Workaround: Limited variant of mixed mode. */ - critical_t crit; - - crit = cpu_critical_enter(); mtx_lock_spin(&icu_lock); INTRDIS(1 << apic_8254_intr); mtx_unlock_spin(&icu_lock); - cpu_critical_exit(crit); inthand_remove(clkdesc); printf("APIC_IO: Broken MP table detected: " "8254 is not connected to " @@ -1126,11 +1115,9 @@ cpu_initclocks() inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); - crit = cpu_critical_enter(); mtx_lock_spin(&icu_lock); INTREN(1 << apic_8254_intr); mtx_unlock_spin(&icu_lock); - cpu_critical_exit(crit); } } |
