xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2020-06-01 00:07:01 +02:00
commit 5f3e72eb84
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/pc/devarch.c
View file

@ -882,12 +882,14 @@ cpuidentify(void)
rdmsr(0x01, &mct); rdmsr(0x01, &mct);
} }
#ifdef PATWC
/* IA32_PAT write combining */ /* IA32_PAT write combining */
if((m->cpuiddx & Pat) != 0 && rdmsr(0x277, &pat) != -1){ if((m->cpuiddx & Pat) != 0 && rdmsr(0x277, &pat) != -1){
pat &= ~(255LL<<(PATWC*8)); pat &= ~(255LL<<(PATWC*8));
pat |= 1LL<<(PATWC*8); /* WC */ pat |= 1LL<<(PATWC*8); /* WC */
wrmsr(0x277, pat); wrmsr(0x277, pat);
} }
#endif
if(m->cpuiddx & Mtrr) if(m->cpuiddx & Mtrr)
mtrrsync(); mtrrsync();

2
sys/src/9/port/page.c
View file

@ -371,7 +371,7 @@ ptealloc(void)
} }
void void
freepte(Segment *s, Pte *p) freepte(Segment*, Pte *p)
{ {
Page **pg, **pe; Page **pg, **pe;