Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c1f0f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'metag-for-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag 

Pull arch/metag update from James Hogan:

 - Various fixes for the interrupting perf counter handling in metag's
   perf backend.

 - Add OProfile support based on perf.

 - Sets up cache partitions for SMP so bootloader doesn't have to.

 - Patch from Paul Bolle to remove ARCH_POPULATES_NODE_MAP again
   (touches microblaze too).

 - Add TLS pointer regset to metag ptrace api.

 - Add exported metag DSP extended context handling header <asm/ech.h>.

 - Increase defconfig log buffer size to 128KiB.

 - Various fixes, typos, missing exports.

* tag 'metag-for-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: defconfigs: increase log buffer 8KiB => 128KiB
  metag: avoid unnecessary builtin dtb rebuilds
  metag: add exported <asm/ech.h> for extended context handling
  metag: export _metag_da_present and cpu_2_hwthread_id
  metag: ptrace: Implement NT_METAG_TLS
  memblock: Kill ARCH_POPULATES_NODE_MAP once more
  metag: cachepart: fix get_global_dcache_size() typo
  metag: cachepart: take into account small cache bits
  metag: smp: copy cache partition and enable GCOn
  metag: OProfile support
  metag: perf: prepare for use by oprofile
  metag: perf: don't reset TXTACTCYC
  metag: perf: use hard_processor_id() to get thread
  metag: perf: fix frequency sampling (dynamic period)
  metag: perf: add missing prev_count updates
  metag: perf: fixes for interrupting perf counters
  metag: perf: fix wrap handling in delta calculation
  metag: perf: fix core internal / perf channel mux
parents 165bc513 164c0138

arch/metag/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ config METAG 
	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_DOMAIN
@@ -209,6 +210,9 @@ config METAG_PERFCOUNTER_IRQS 
	  When disabled, Performance Counters information will be collected

	  based on Timer Interrupt.



config HW_PERF_EVENTS

	def_bool METAG_PERFCOUNTER_IRQS && PERF_EVENTS



config METAG_DA

	bool "DA support"

	help

arch/metag/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ core-y += arch/metag/mm/ 
libs-y					+= arch/metag/lib/

libs-y					+= arch/metag/tbx/



drivers-$(CONFIG_OPROFILE)		+= arch/metag/oprofile/



boot					:= arch/metag/boot



boot_targets				+= uImage

arch/metag/boot/dts/Makefile

+7 −3
Original line number Diff line number Diff line
@@ -4,13 +4,17 @@ dtb-y += skeleton.dtb 
builtindtb-y				:= skeleton



ifneq ($(CONFIG_METAG_BUILTIN_DTB_NAME),"")

	builtindtb-y			:= $(CONFIG_METAG_BUILTIN_DTB_NAME)

	builtindtb-y			:= $(patsubst "%",%,$(CONFIG_METAG_BUILTIN_DTB_NAME))

endif

obj-$(CONFIG_METAG_BUILTIN_DTB)	+= $(patsubst "%",%,$(builtindtb-y)).dtb.o



dtb-$(CONFIG_METAG_BUILTIN_DTB)	+= $(builtindtb-y).dtb

obj-$(CONFIG_METAG_BUILTIN_DTB)	+= $(builtindtb-y).dtb.o



targets	+= dtbs

targets	+= $(dtb-y)



.SECONDARY: $(obj)/$(builtindtb-y).dtb.S



dtbs: $(addprefix $(obj)/, $(dtb-y))



clean-files += *.dtb
 
clean-files += *.dtb *.dtb.S

arch/metag/configs/meta1_defconfig

+0 −1
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_LOG_BUF_SHIFT=13

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_KALLSYMS_ALL=y

arch/metag/configs/meta2_defconfig

+0 −1
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=13

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_KALLSYMS_ALL=y