D57888.id180741.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57888.id180741.diff
View Options

	diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
	--- a/sys/dev/acpica/acpi_cpu.c
	+++ b/sys/dev/acpica/acpi_cpu.c
	@@ -140,9 +140,6 @@

	#define CPUDEV_DEVICE_ID "ACPI0007"

	-/* Knob to disable acpi_cpu devices */
	-bool acpi_cpu_disabled = false;
	-
	/* Platform hardware resource information. */
	static uint32_t cpu_smi_cmd; /* Value to write to SMI_CMD. */
	static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */
	@@ -239,7 +236,7 @@
	ACPI_STATUS status;
	ACPI_OBJECT_TYPE type;

	- if (acpi_disabled("cpu") \|\| acpi_cpu_disabled)
	+ if (acpi_disabled("cpu"))
	return (ENXIO);
	type = acpi_get_type(dev);
	if (type != ACPI_TYPE_PROCESSOR && type != ACPI_TYPE_DEVICE)
	diff --git a/sys/x86/include/init.h b/sys/x86/include/init.h
	--- a/sys/x86/include/init.h
	+++ b/sys/x86/include/init.h
	@@ -43,9 +43,6 @@

	extern struct init_ops init_ops;

	-/* Knob to disable acpi_cpu devices */
	-extern bool acpi_cpu_disabled;
	-
	/* Knob to disable acpi_hpet device */
	extern bool acpi_hpet_disabled;