merge
This commit is contained in:
commit
5f3e72eb84
2 changed files with 3 additions and 1 deletions
|
@ -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();
|
||||
|
|
|
@ -371,7 +371,7 @@ ptealloc(void)
|
|||
}
|
||||
|
||||
void
|
||||
freepte(Segment *s, Pte *p)
|
||||
freepte(Segment*, Pte *p)
|
||||
{
|
||||
Page **pg, **pe;
|
||||
|
||||
|
|
Loading…
Reference in a new issue