shithub: riscv

Info  •  Files  •  Log  •  Branches

merge

--- a/sys/src/9/pc/devarch.c

+++ b/sys/src/9/pc/devarch.c

@@ -882,6 +882,7 @@

 			rdmsr(0x01, &mct);

 	}

+#ifdef PATWC

 	/* IA32_PAT write combining */

 	if((m->cpuiddx & Pat) != 0 && rdmsr(0x277, &pat) != -1){

 		pat &= ~(255LL<<(PATWC*8));

@@ -888,6 +889,7 @@

 		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 @@

 }

 void

-freepte(Segment *s, Pte *p)

+freepte(Segment*, Pte *p)

 {

 	Page **pg, **pe;