Merge branch 'osc-bugfix' into release (b4cdd6ac) · Commits · 戴 / test

drivers/acpi/bus.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -490,9 +490,14 @@ static void acpi_bus_osc_support(void)

		capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
		capbuf[OSC_SUPPORT_TYPE] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
		#ifdef CONFIG_ACPI_PROCESSOR_AGGREGATOR
		#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) \|\|\
		defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)
		capbuf[OSC_SUPPORT_TYPE] \|= OSC_SB_PAD_SUPPORT;
		#endif

		#if defined(CONFIG_ACPI_PROCESSOR) \|\| defined(CONFIG_ACPI_PROCESSOR_MODULE)
		capbuf[OSC_SUPPORT_TYPE] \|= OSC_SB_PPC_OST_SUPPORT;
		#endif
		if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
		return;
		if (ACPI_SUCCESS(acpi_run_osc(handle, &context)))