Commit ba8042a8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

Pull turbostat utility updates for v4.18 from Len Brown.

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (65 commits)
  tools/power turbostat: update version number
  tools/power turbostat: Add Node in output
  tools/power turbostat: add node information into turbostat calculations
  tools/power turbostat: remove num_ from cpu_topology struct
  tools/power turbostat: rename num_cores_per_pkg to num_cores_per_node
  tools/power turbostat: track thread ID in cpu_topology
  tools/power turbostat: Calculate additional node information for a package
  tools/power turbostat: Fix node and siblings lookup data
  tools/power turbostat: set max_num_cpus equal to the cpumask length
  tools/power turbostat: if --num_iterations, print for specific number of iterations
  tools/power turbostat: Add Cannon Lake support
  tools/power turbostat: delete duplicate #defines
  x86: msr-index.h: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
  tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
  tools/power turbostat: add POLL and POLL% column
  tools/power turbostat: Fix --hide Pk%pc10
  tools/power turbostat: Build-in "Low Power Idle" counters support
  tools/power turbostat: Don't make man pages executable
  tools/power turbostat: remove blank lines
  tools/power turbostat: a small C-states dump readability immprovement
  ...
parents b04e2177 201d4f50

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -14371,6 +14371,15 @@ S: Maintained 
F:	drivers/tc/

F:	include/linux/tc.h



TURBOSTAT UTILITY

M:	"Len Brown" <lenb@kernel.org>

L:	linux-pm@vger.kernel.org

B:	https://bugzilla.kernel.org

Q:	https://patchwork.kernel.org/project/linux-pm/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat

S:	Supported

F:	tools/power/x86/turbostat/



TW5864 VIDEO4LINUX DRIVER

M:	Bluecherry Maintainers <maintainers@bluecherrydvr.com>

M:	Anton Sviridenko <anton@corp.bluecherry.net>

arch/nds32/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ config NDS32 
	select CLKSRC_MMIO

	select CLONE_BACKWARDS

	select COMMON_CLK

	select GENERIC_ASHLDI3

	select GENERIC_ASHRDI3

	select GENERIC_LSHRDI3

	select GENERIC_CMPDI2

	select GENERIC_MULDI3

	select GENERIC_UCMPDI2

	select GENERIC_ATOMIC64

	select GENERIC_CPU_DEVICES

	select GENERIC_CLOCKEVENTS
@@ -82,6 +88,7 @@ endmenu 


menu "Kernel Features"

source "kernel/Kconfig.preempt"

source "kernel/Kconfig.freezer"

source "mm/Kconfig"

source "kernel/Kconfig.hz"

endmenu

arch/nds32/Kconfig.cpu

+3 −2
Original line number Diff line number Diff line 
comment "Processor Features"



config CPU_BIG_ENDIAN

	bool "Big endian"

	def_bool !CPU_LITTLE_ENDIAN



config CPU_LITTLE_ENDIAN

        def_bool !CPU_BIG_ENDIAN

	bool "Little endian"

	default y



config HWZOL

	bool "hardware zero overhead loop support"

arch/nds32/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ export TEXTADDR 
# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/nds32/kernel/ arch/nds32/mm/

libs-y				+= arch/nds32/lib/

LIBGCC_PATH     		:= \

  $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)

libs-y				+= $(LIBGCC_PATH)



ifneq '$(CONFIG_NDS32_BUILTIN_DTB)' '""'

BUILTIN_DTB := y
@@ -35,8 +32,12 @@ endif 


ifdef CONFIG_CPU_LITTLE_ENDIAN

KBUILD_CFLAGS   += $(call cc-option, -EL)

KBUILD_AFLAGS   += $(call cc-option, -EL)

LDFLAGS         += $(call cc-option, -EL)

else

KBUILD_CFLAGS   += $(call cc-option, -EB)

KBUILD_AFLAGS   += $(call cc-option, -EB)

LDFLAGS         += $(call cc-option, -EB)

endif



boot := arch/nds32/boot

arch/nds32/include/asm/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ generic-y += dma.h 
generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += export.h

generic-y += fb.h

generic-y += fcntl.h

generic-y += ftrace.h
@@ -49,6 +50,7 @@ generic-y += switch_to.h 
generic-y += timex.h

generic-y += topology.h

generic-y += trace_clock.h

generic-y += xor.h

generic-y += unaligned.h

generic-y += user.h

generic-y += vga.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE