From patchwork Sat Jan 23 19:51:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 74911 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0NJpMk8016172 for ; Sat, 23 Jan 2010 19:51:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751255Ab0AWTvW (ORCPT ); Sat, 23 Jan 2010 14:51:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751836Ab0AWTvV (ORCPT ); Sat, 23 Jan 2010 14:51:21 -0500 Received: from vms173001pub.verizon.net ([206.46.173.1]:59588 "EHLO vms173001pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751255Ab0AWTvV (ORCPT ); Sat, 23 Jan 2010 14:51:21 -0500 Received: from localhost.localdomain ([unknown] [74.104.151.18]) by vms173001.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0KWP00LARTT5W0E3@vms173001.mailsrvcs.net> for linux-acpi@vger.kernel.org; Sat, 23 Jan 2010 13:51:20 -0600 (CST) Received: from localhost.localdomain (d975xbx2 [127.0.0.1]) by localhost.localdomain (8.14.2/8.14.2) with ESMTP id o0NJp51d005684; Sat, 23 Jan 2010 14:51:05 -0500 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.2/8.14.2/Submit) with ESMTP id o0NJp4tT005680; Sat, 23 Jan 2010 14:51:04 -0500 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Sat, 23 Jan 2010 14:51:04 -0500 (EST) From: Len Brown X-X-Sender: lenb@localhost.localdomain To: stable@kernel.org Cc: linux-acpi@vger.kernel.org, Zhao Yakui Subject: [PATCH 2.6.32.stable] ACPI: Advertise to BIOS in _OSC: _OST on _PPC changes Message-id: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index cf761b9..a52126e 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -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)))