D42248.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D42248.diff
View Options

	diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
	--- a/sys/x86/acpica/madt.c
	+++ b/sys/x86/acpica/madt.c
	@@ -221,7 +221,7 @@
	else if (bootverbose)
	printf("x2APIC available but disabled %s\n", reason);
	user_x2apic = x2apic_mode;
	- TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic);
	+ TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic);
	if (user_x2apic != x2apic_mode) {
	if (bios_x2apic && !user_x2apic)
	printf("x2APIC disabled by tunable and "
	diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
	--- a/sys/x86/iommu/intel_drv.c
	+++ b/sys/x86/iommu/intel_drv.c
	@@ -429,7 +429,7 @@
	dmar_quirks_post_ident(unit);

	timeout = dmar_get_timeout();
	- TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout);
	+ TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout);
	dmar_update_timeout(timeout);

	for (i = 0; i < DMAR_INTR_TOTAL; i++)
	diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
	--- a/sys/x86/x86/local_apic.c
	+++ b/sys/x86/x86/local_apic.c
	@@ -493,7 +493,7 @@
	(cpu_feature2 & CPUID2_TSCDLT) != 0 &&
	tsc_is_invariant && tsc_freq != 0) {
	lapic_timer_tsc_deadline = 1;
	- TUNABLE_INT_FETCH("hw.lapic_tsc_deadline",
	+ TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline",
	&lapic_timer_tsc_deadline);
	}

	@@ -526,7 +526,7 @@
	"KVM -- disabling lapic eoi suppression\n");
	lapic_eoi_suppression = 0;
	}
	- TUNABLE_INT_FETCH("hw.lapic_eoi_suppression",
	+ TUNABLE_INT_FETCH("hw.apic.eoi_suppression",
	&lapic_eoi_suppression);
	}