]> git.baikalelectronics.ru Git - kernel.git/commit
perf/x86: Make merge_attr() global to use from perf_event_intel
authorAndi Kleen <ak@linux.intel.com>
Mon, 29 Jun 2015 21:22:13 +0000 (14:22 -0700)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Aug 2015 08:16:59 +0000 (10:16 +0200)
commit4614517a17159b326c68559b01aa27710f94aa89
treecc3baf195f54a6197c4b3c1c4423af14f0987b99
parentc2bdaa9d379f0d53d867b6ce8f95bed92a66a306
perf/x86: Make merge_attr() global to use from perf_event_intel

merge_attr() allows to merge two sysfs attribute tables.
Export it to be usable by other files too.

Next patch is going to use that to extend the sysfs format
attributes for a CPU.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: eranian@google.com
Link: http://lkml.kernel.org/r/1435612935-24425-1-git-send-email-andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event.h