From 623b1a868e6ad59e21ecc0ba4a4f9fabbfca787b Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 5 Jul 2005 20:13:12 +0000 Subject: [PATCH] Remove a || 1 that crept into the i8254 commit and was subsequently copied and pasted. I had actually tested without this change in my trees as had the other testers. Reported by: bde, Rostislav Krasny rosti dot bsd at gmail dot com Approved by: re (scottl) Pointy hat to: jhb --- sys/amd64/isa/clock.c | 2 +- sys/i386/isa/clock.c | 2 +- sys/isa/atrtc.c | 2 +- sys/pc98/cbus/clock.c | 2 +- sys/pc98/cbus/pcrtc.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 914b4b23877..727d1cf8e70 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -736,7 +736,7 @@ cpu_initclocks() * that it can drive hardclock(). Otherwise, change the 8254 * timecounter to user a simpler algorithm. */ - if (!using_lapic_timer || 1) { + if (!using_lapic_timer) { intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); i8254_intsrc = intr_lookup_source(0); diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index e2358e44151..3570be18ac9 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -786,7 +786,7 @@ cpu_initclocks() * that it can drive hardclock(). Otherwise, change the 8254 * timecounter to user a simpler algorithm. */ - if (!using_lapic_timer || 1) { + if (!using_lapic_timer) { intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); i8254_intsrc = intr_lookup_source(0); diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index e2358e44151..3570be18ac9 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -786,7 +786,7 @@ cpu_initclocks() * that it can drive hardclock(). Otherwise, change the 8254 * timecounter to user a simpler algorithm. */ - if (!using_lapic_timer || 1) { + if (!using_lapic_timer) { intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); i8254_intsrc = intr_lookup_source(0); diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 7f50c99657f..9922fa244ff 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -765,7 +765,7 @@ cpu_initclocks() * that it can drive hardclock(). Otherwise, change the 8254 * timecounter to user a simpler algorithm. */ - if (!using_lapic_timer || 1) { + if (!using_lapic_timer) { intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); i8254_intsrc = intr_lookup_source(0); diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 7f50c99657f..9922fa244ff 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -765,7 +765,7 @@ cpu_initclocks() * that it can drive hardclock(). Otherwise, change the 8254 * timecounter to user a simpler algorithm. */ - if (!using_lapic_timer || 1) { + if (!using_lapic_timer) { intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); i8254_intsrc = intr_lookup_source(0);