D9630.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9630.diff
View Options

	Index: head/sys/amd64/amd64/amd64_mem.c
	===================================================================
	--- head/sys/amd64/amd64/amd64_mem.c
	+++ head/sys/amd64/amd64/amd64_mem.c
	@@ -609,6 +609,10 @@
	u_int regs[4];
	int i, nmdesc = 0, pabits;

	+ if (sc->mr_desc != NULL)
	+ /* Already initialized. */
	+ return;
	+
	mtrrcap = rdmsr(MSR_MTRRcap);
	mtrrdef = rdmsr(MSR_MTRRdefType);

	@@ -750,5 +754,6 @@
	return;
	}
	mem_range_softc.mr_op = &amd64_mrops;
	+ amd64_mrinit(&mem_range_softc);
	}
	-SYSINIT(amd64memdev, SI_SUB_DRIVERS, SI_ORDER_FIRST, amd64_mem_drvinit, NULL);
	+SYSINIT(amd64memdev, SI_SUB_CPU, SI_ORDER_ANY, amd64_mem_drvinit, NULL);
	Index: head/sys/i386/i386/i686_mem.c
	===================================================================
	--- head/sys/i386/i386/i686_mem.c
	+++ head/sys/i386/i386/i686_mem.c
	@@ -588,6 +588,10 @@
	u_int regs[4];
	int i, nmdesc = 0, pabits;

	+ if (sc->mr_desc != NULL)
	+ /* Already initialized. */
	+ return;
	+
	mtrrcap = rdmsr(MSR_MTRRcap);
	mtrrdef = rdmsr(MSR_MTRRdefType);

	@@ -716,5 +720,6 @@
	return;
	}
	mem_range_softc.mr_op = &i686_mrops;
	+ i686_mrinit(&mem_range_softc);
	}
	-SYSINIT(i686memdev, SI_SUB_DRIVERS, SI_ORDER_FIRST, i686_mem_drvinit, NULL);
	+SYSINIT(i686memdev, SI_SUB_CPU, SI_ORDER_ANY, i686_mem_drvinit, NULL);