From patchwork Tue Nov 17 22:27:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 60801 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAHMSi3Q026855 for ; Tue, 17 Nov 2009 22:28:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756357AbZKQW2q (ORCPT ); Tue, 17 Nov 2009 17:28:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756365AbZKQW2q (ORCPT ); Tue, 17 Nov 2009 17:28:46 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:60487 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756354AbZKQW2p (ORCPT ); Tue, 17 Nov 2009 17:28:45 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id nAHMRY7D015108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 Nov 2009 14:27:35 -0800 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id nAHMRX7i023346; Tue, 17 Nov 2009 14:27:33 -0800 Message-Id: <200911172227.nAHMRX7i023346@imap1.linux-foundation.org> Subject: [patch 07/12] acpi: thermal: display forced passive trip points in proc To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, elendil@planet.nl, mjg59@srcf.ucam.org, rui.zhang@intel.com From: akpm@linux-foundation.org Date: Tue, 17 Nov 2009 14:27:33 -0800 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.518 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff -puN drivers/acpi/thermal.c~acpi-thermal-display-forced-passive-trip-points-in-proc drivers/acpi/thermal.c --- a/drivers/acpi/thermal.c~acpi-thermal-display-forced-passive-trip-points-in-proc +++ a/drivers/acpi/thermal.c @@ -1052,6 +1052,13 @@ static int acpi_thermal_trip_seq_show(st acpi_device_bid(device)); } seq_puts(seq, "\n"); + } else { + seq_printf(seq, "passive (forced):"); + if (tz->thermal_zone->forced_passive) + seq_printf(seq, " %i C\n", + tz->thermal_zone->forced_passive / 1000); + else + seq_printf(seq, "\n"); } for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {