]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-tools' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:13:34 +0000 (23:13 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:13:34 +0000 (23:13 +0200)
* acpi-tools:
  ACPI / tools: Introduce ec_access.c - tool to access the EC

* pm-tools:
  cpupower: Remove mc and smt power aware scheduler info/settings
  cpupower: cpupower info -b should return 0 on success, not the perf bias value
  cpupower: If root, try to load msr driver on x86 if /dev/cpu/0/msr is not available
  cpupower: Install recently added cpupower-idle-{set, info} manpages
  cpupower: Introduce idle state disable-by-latency and enable-all
  cpupower: Remove all manpages on make uninstall
  cpupower: Remove dead link to homepage, and update the targets built.
  cpupower: Rename cpufrequtils -> cpupower, and libcpufreq -> libcpupower.
  PM / tools: cpupower: add option to display values without round offs
  tools / power: turbostat: Drop temperature checks

1  2  3 
tools/power/acpi/Makefile
tools/power/cpupower/Makefile

index 7ac578019ea9c122b07675060df8276f4224df68,c225d6d9fb2919e099a56e59702711804168759c,c2c0f20067a5028ebf304ca4758c830b80ffbe35..e5a3c4be2a10d696c31aebc733234964197affad
@@@@ -19,6 -19,8 -19,6 +19,8 @@@@ OUTDIR := $(shell cd $(OUTPUT) && /bin/
   $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
   endif
   
+ +SUBDIRS = tools/ec
+ +
   # --- CONFIGURATION BEGIN ---
   
   # Set the following to `true' to make a unstripped, unoptimized
@@@@ -68,8 -70,7 -68,7 +70,8 @@@@ WARNINGS += $(call cc-supports,-Wstrict
   WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
   
   KERNEL_INCLUDE := ../../../include
 --CFLAGS += -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
 ++ACPICA_INCLUDE := ../../../drivers/acpi/acpica
 ++CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
   CFLAGS += $(WARNINGS)
   
   ifeq ($(strip $(V)),false)
@@@@ -93,29 -94,10 -92,10 +95,29 @@@@ endi
   # --- ACPIDUMP BEGIN ---
   
   vpath %.c \
 --     tools/acpidump
 ++     ../../../drivers/acpi/acpica\
 ++     tools/acpidump\
 ++     common\
 ++     os_specific/service_layers
 ++
 ++CFLAGS += -DACPI_DUMP_APP -Itools/acpidump
   
   DUMP_OBJS = \
 --     acpidump.o
 ++     apdump.o\
 ++     apfiles.o\
 ++     apmain.o\
 ++     osunixdir.o\
 ++     osunixmap.o\
 ++     tbprint.o\
 ++     tbxfroot.o\
 ++     utbuffer.o\
 ++     utexcep.o\
 ++     utmath.o\
 ++     utstring.o\
 ++     utxferror.o\
 ++     oslinuxtbl.o\
 ++     cmfsize.o\
 ++     getopt.o
   
   DUMP_OBJS := $(addprefix $(OUTPUT)tools/acpidump/,$(DUMP_OBJS))
   
index 3651db7eda238a91de7c9c6a804516526563c0c4,cbfec92af32766b2570cc9add2ce4c3290bcd75e,78ce109aa044bd5359f3ea7be5d3b4ac48380266..2e2ba2efa0d9f97629ec5af9fb1136b3dee8962d
@@@@ -62,7 -62,7 -62,7 +62,7 @@@@ LIB_MAJ=                      0.0.
   LIB_MIN=                     0
   
   PACKAGE =                    cpupower
 --PACKAGE_BUGREPORT =          cpufreq@vger.kernel.org
 ++PACKAGE_BUGREPORT =          linux-pm@vger.kernel.org
   LANGUAGES =                  de fr it cs pt
   
   
@@@@ -274,6 -274,6 -274,8 +274,8 @@@@ install-man
        $(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
        $(INSTALL_DATA) -D man/cpupower-frequency-set.1 $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
        $(INSTALL_DATA) -D man/cpupower-frequency-info.1 $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
++      $(INSTALL_DATA) -D man/cpupower-idle-set.1 $(DESTDIR)${mandir}/man1/cpupower-idle-set.1
++      $(INSTALL_DATA) -D man/cpupower-idle-info.1 $(DESTDIR)${mandir}/man1/cpupower-idle-info.1
        $(INSTALL_DATA) -D man/cpupower-set.1 $(DESTDIR)${mandir}/man1/cpupower-set.1
        $(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1
        $(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1
@@@@ -295,8 -295,8 -297,12 +297,12 @@@@ uninstall
        - rm -f $(DESTDIR)${libdir}/libcpupower.*
        - rm -f $(DESTDIR)${includedir}/cpufreq.h
        - rm -f $(DESTDIR)${bindir}/utils/cpupower
--      - rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1
--      - rm -f $(DESTDIR)${mandir}/man1/cpufreq-info.1
++      - rm -f $(DESTDIR)${mandir}/man1/cpupower.1
++      - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
++      - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
++      - rm -f $(DESTDIR)${mandir}/man1/cpupower-set.1
++      - rm -f $(DESTDIR)${mandir}/man1/cpupower-info.1
++      - rm -f $(DESTDIR)${mandir}/man1/cpupower-monitor.1
        - for HLANG in $(LANGUAGES); do \
                rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \
          done;