summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@gmx.de>2013-06-21 02:49:08 +0200
committercinap_lenrek <cinap_lenrek@gmx.de>2013-06-21 02:49:08 +0200
commit49c9955aea7348027e3e6925609904ee11dfdee6 (patch)
tree43d4f5461c006ceedf95ed2ec363bec5e3d5bdd9
parent8da4c8dcde68ca1da9b131cfcea917e781abf768 (diff)
reverting *notsc= option, this needs another revision
-rw-r--r--sys/man/8/plan9.ini5
-rw-r--r--sys/src/9/pc/devarch.c2
2 files changed, 1 insertions, 6 deletions
diff --git a/sys/man/8/plan9.ini b/sys/man/8/plan9.ini
index 48aab7f37..61115f7fd 100644
--- a/sys/man/8/plan9.ini
+++ b/sys/man/8/plan9.ini
@@ -720,11 +720,6 @@ processors.
Prints a summary of the multiprocessor APIC interrupt configuration.
.SS \fL*nomsi=\fP
Disables message signaled interrupts.
-.SS \fL*notsc=\fP
-Disables the use of the per processor timestamp counter registers
-as high resolution clock. This option is intended for machines where
-the timestamp counter rate is not constant across cores or is adjusted
-dynamically by power management.
.SS \fL*pcimaxbno=value\fP
This puts a limit on the maximum bus number probed
on a PCI bus (default 7).
diff --git a/sys/src/9/pc/devarch.c b/sys/src/9/pc/devarch.c
index 90cc2f4b9..be29eab3c 100644
--- a/sys/src/9/pc/devarch.c
+++ b/sys/src/9/pc/devarch.c
@@ -797,7 +797,7 @@ cpuidentify(void)
/*
* if there is one, set tsc to a known value
*/
- if((m->cpuiddx & Tsc) != 0 && getconf("*notsc") == nil){
+ if(m->cpuiddx & Tsc){
m->havetsc = 1;
cycles = _cycles;
if(m->cpuiddx & Cpumsr)