diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-06-01 00:07:01 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-06-01 00:07:01 +0200 |
| commit | 5f3e72eb844582693e1b0bd4f73be59ab822531e (patch) | |
| tree | 200bce83c1d313921f239bffa486484a3f2666b0 | |
| parent | 8918bd598190b8c467746524f1886cc40be0b617 (diff) | |
| parent | 94916808dd9a53ac297ab537851791894b919828 (diff) | |
merge
| -rw-r--r-- | sys/src/9/pc/devarch.c | 2 | ||||
| -rw-r--r-- | sys/src/9/port/page.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/src/9/pc/devarch.c b/sys/src/9/pc/devarch.c index 595cbcb8b..d637d5aa3 100644 --- a/sys/src/9/pc/devarch.c +++ b/sys/src/9/pc/devarch.c @@ -882,12 +882,14 @@ cpuidentify(void) rdmsr(0x01, &mct); } +#ifdef PATWC /* IA32_PAT write combining */ if((m->cpuiddx & Pat) != 0 && rdmsr(0x277, &pat) != -1){ pat &= ~(255LL<<(PATWC*8)); pat |= 1LL<<(PATWC*8); /* WC */ wrmsr(0x277, pat); } +#endif if(m->cpuiddx & Mtrr) mtrrsync(); diff --git a/sys/src/9/port/page.c b/sys/src/9/port/page.c index a55242c4d..0a039c099 100644 --- a/sys/src/9/port/page.c +++ b/sys/src/9/port/page.c @@ -371,7 +371,7 @@ ptealloc(void) } void -freepte(Segment *s, Pte *p) +freepte(Segment*, Pte *p) { Page **pg, **pe; |