diff options
| author | phk <phk@FreeBSD.org> | 2000-10-28 06:55:12 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-10-28 06:55:12 +0000 |
| commit | 2e92b951979d4d91aec3c4bfb7420c88c2bec165 (patch) | |
| tree | 47888140b031fdc4c67968f93a113bf041ef2b30 /sys | |
| parent | 25edde61bd32b25aa0283f4b7559433476ba0b87 (diff) | |
| download | FreeBSD-src-2e92b951979d4d91aec3c4bfb7420c88c2bec165.zip FreeBSD-src-2e92b951979d4d91aec3c4bfb7420c88c2bec165.tar.gz | |
Revert two experimental changes which escaped from my devel machine.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/tsc.c | 2 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC.hints | 2 | ||||
| -rw-r--r-- | sys/amd64/isa/clock.c | 2 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC.hints | 2 | ||||
| -rw-r--r-- | sys/i386/i386/tsc.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/clock.c | 2 | ||||
| -rw-r--r-- | sys/isa/atrtc.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 8a84bf8..1ad7bf4 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -189,7 +189,7 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD, static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - 0x1ffff, /* counter_mask */ + ~0u, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints index 9603f4b..652faa9 100644 --- a/sys/amd64/conf/GENERIC.hints +++ b/sys/amd64/conf/GENERIC.hints @@ -32,7 +32,7 @@ hint.npx.0.at="nexus" hint.npx.0.port="0x0F0" hint.npx.0.irq="13" hint.apm.0.at="nexus" -#hint.apm.0.disabled="1" +hint.apm.0.disabled="1" hint.apm.0.flags="0x20" hint.pcic.0.at="isa" # hint.pcic.0.irq="10" # Default to polling diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 8a84bf8..1ad7bf4 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -189,7 +189,7 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD, static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - 0x1ffff, /* counter_mask */ + ~0u, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; diff --git a/sys/i386/conf/GENERIC.hints b/sys/i386/conf/GENERIC.hints index 9603f4b..652faa9 100644 --- a/sys/i386/conf/GENERIC.hints +++ b/sys/i386/conf/GENERIC.hints @@ -32,7 +32,7 @@ hint.npx.0.at="nexus" hint.npx.0.port="0x0F0" hint.npx.0.irq="13" hint.apm.0.at="nexus" -#hint.apm.0.disabled="1" +hint.apm.0.disabled="1" hint.apm.0.flags="0x20" hint.pcic.0.at="isa" # hint.pcic.0.irq="10" # Default to polling diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 8a84bf8..1ad7bf4 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -189,7 +189,7 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD, static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - 0x1ffff, /* counter_mask */ + ~0u, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 8a84bf8..1ad7bf4 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -189,7 +189,7 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD, static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - 0x1ffff, /* counter_mask */ + ~0u, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 8a84bf8..1ad7bf4 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -189,7 +189,7 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD, static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - 0x1ffff, /* counter_mask */ + ~0u, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; |
