From patchwork Mon Dec 17 19:17:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 1888571 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8F30A3FCD5 for ; Mon, 17 Dec 2012 19:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752478Ab2LQTRa (ORCPT ); Mon, 17 Dec 2012 14:17:30 -0500 Received: from mail-qa0-f53.google.com ([209.85.216.53]:38848 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752179Ab2LQTR3 (ORCPT ); Mon, 17 Dec 2012 14:17:29 -0500 Received: by mail-qa0-f53.google.com with SMTP id a19so2694733qad.19 for ; Mon, 17 Dec 2012 11:17:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=fMeDL3gMfLT4+3B3tLH1/ZdJU93VcyFbl1VIh+jG7w0=; b=xtzvcC3FxMtw35MNE6+ecOC/8hVJ4ER51s6iLHhf2p+n7Y0CBLp+nJgfmgNXDMsgYt asIbJyyy6g3kbzfk6uV/XfmWFKKZMd4qa3cpw0+wkW35ssnOkyyI5iluMQCUwipVXKjY gSyiW29C/LKhgGEl7vrYXPoMrTGRB/OgimxRLWg4cXKWAaxqD0Vi0716ph9K+7ugKXaH 6rGvacjBUOt8vO4G/E05I1RYqKEOP/Kd2qY30nQY49vaFwACiAmllZYyVoS0Oa0KKT/R Xx91p8k4OTmaQKz3I/71F/0KLE9gMcisqOTeb5BPZC+VJiCYCjx75ieSWvDoZe3g5r3J I1Wg== Received: by 10.49.59.48 with SMTP id w16mr7451412qeq.38.1355771848663; Mon, 17 Dec 2012 11:17:28 -0800 (PST) Received: from [192.168.0.98] ([173.48.76.143]) by mx.google.com with ESMTPS id eg9sm365460qab.7.2012.12.17.11.17.26 (version=SSLv3 cipher=OTHER); Mon, 17 Dec 2012 11:17:27 -0800 (PST) Message-ID: <50CF6FC5.20005@kernel.org> Date: Mon, 17 Dec 2012 14:17:25 -0500 From: Len Brown User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Linus Torvalds CC: Linux PM list , linux-kernel Subject: [GIT PULL] power tools for Linux-3.8 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Hi Linus, Please pull these power tools patches. This updates the tree w/ the latest version of turbostat, which reports temperature and - on SNB and later - Watts. There will be a logical conflict with the uapi changes which breaks the turbostat build. It can be fixed this way: Len Brown, Intel Open Source Technology Center The following changes since commit d91bb17c2a874493603c4d99db305d8caf2d180c: tools/power turbostat: graceful fail on garbage input (2012-11-01 00:22:00 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git next for you to fetch changes up to 55f1f545f709a6023371848028a3029118855576: tools: Allow tools to be installed in a user specified location (2012-11-30 01:09:45 -0500) ---------------------------------------------------------------- Colin Ian King (1): tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu() Josh Boyer (1): tools: Allow tools to be installed in a user specified location Len Brown (5): tools/power/x86/turbostat: share kernel MSR #defines x86 power: define RAPL MSRs tools/power turbostat: prevent infinite loop on migration error path tools/power turbostat: fix output buffering issue tools/power turbostat: v3.0: monitor Watts and Temperature Mark Asselstine (1): tools/power: turbostat: make Makefile a bit more capable arch/x86/include/asm/msr-index.h | 37 ++ tools/power/x86/turbostat/Makefile | 21 +- tools/power/x86/turbostat/turbostat.8 | 103 ++-- tools/power/x86/turbostat/turbostat.c | 677 +++++++++++++++++++-- tools/power/x86/x86_energy_perf_policy/Makefile | 6 +- .../x86_energy_perf_policy.c | 2 +- 6 files changed, 765 insertions(+), 81 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index e48ef07..f09641d 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile @@ -5,7 +5,7 @@ DESTDIR := turbostat : turbostat.c CFLAGS += -Wall -CFLAGS += -I../../../../arch/x86/include/ +CFLAGS += -I../../../../arch/x86/include/uapi/ thanks!