merge

2020-06-01 00:07:01 +02:00 · 2020-06-01 00:07:01 +02:00 · 5f3e72eb84
parent 8918bd5981 94916808dd
commit 5f3e72eb84
2 changed files with 3 additions and 1 deletions
--- 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();
--- 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;