diff options
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 2 | ||||
| -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 |
4 files changed, 3 insertions, 5 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 62c698b..1d15d39 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -250,8 +250,6 @@ struct cpuhead cpuhead; MUTEX_DECLARE(,sched_lock); MUTEX_DECLARE(,Giant); -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) - static void cpu_startup(dummy) void *dummy; diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 1ad7bf4..8a84bf8 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 */ - ~0u, /* counter_mask */ + 0x1ffff, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints index 652faa9..9603f4b 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 1ad7bf4..8a84bf8 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 */ - ~0u, /* counter_mask */ + 0x1ffff, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; |
