From: Len Brown <lenb@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux PM list <linux-pm@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] power tools for Linux-3.8
Date: Mon, 17 Dec 2012 14:17:25 -0500 [thread overview]
Message-ID: <50CF6FC5.20005@kernel.org> (raw)
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:
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!
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(-)
next reply other threads:[~2012-12-17 19:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 19:17 Len Brown [this message]
2012-12-18 20:38 ` [GIT PULL] power tools for Linux-3.8 Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50CF6FC5.20005@kernel.org \
--to=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).