From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Dec 2012 20:34:29 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: v6.6-pxa1908~26392
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=6842d98de7bb726dfddc719cb9ae022b26a0f2b8;p=linux.git

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull powertool update from Len Brown:
 "This updates the tree w/ the latest version of turbostat, which
  reports temperature and - on SNB and later - Watts."

Fix up semantic merge conflict as per Len.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools: Allow tools to be installed in a user specified location
  tools/power: turbostat: make Makefile a bit more capable
  tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu()
  tools/power turbostat: v3.0: monitor Watts and Temperature
  tools/power turbostat: fix output buffering issue
  tools/power turbostat: prevent infinite loop on migration error path
  x86 power: define RAPL MSRs
  tools/power/x86/turbostat: share kernel MSR #defines
---

6842d98de7bb726dfddc719cb9ae022b26a0f2b8
diff --cc tools/power/x86/turbostat/Makefile
index f85649554191,e48ef07156c1..f09641da40d4
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
@@@ -1,9 -1,22 +1,22 @@@
+ CC		= $(CROSS_COMPILE)gcc
+ BUILD_OUTPUT	:= $(PWD)
+ PREFIX		:= /usr
+ DESTDIR		:=
+ 
  turbostat : turbostat.c
  CFLAGS +=	-Wall
 -CFLAGS +=	-I../../../../arch/x86/include/
++CFLAGS +=	-I../../../../arch/x86/include/uapi/
+ 
+ %: %.c
+ 	@mkdir -p $(BUILD_OUTPUT)
+ 	$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@
  
+ .PHONY : clean
  clean :
- 	rm -f turbostat
+ 	@rm -f $(BUILD_OUTPUT)/turbostat
  
- install :
- 	install turbostat /usr/bin/turbostat
- 	install turbostat.8 /usr/share/man/man8
+ install : turbostat
+ 	install -d  $(DESTDIR)$(PREFIX)/bin
+ 	install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat
+ 	install -d  $(DESTDIR)$(PREFIX)/share/man/man8
+ 	install turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8