From: Andi Kleen <ak@linux.intel.com>
Date: Mon, 29 Jun 2015 21:22:13 +0000 (-0700)
Subject: perf/x86: Make merge_attr() global to use from perf_event_intel
X-Git-Tag: omap-for-v4.3/fixes-merge-window~24^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47732d886385af769449022a02c7cf0ce45d8a5c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed