Commit 80594769 authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo-20160324' of...

Merge tag 'perf-urgent-for-mingo-20160324' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 - Fix detached tarball building due to missing 'perf bench memcpy' headers
   (Arnaldo Carvalho de Melo)

 - Fix tarpkg build test error output redirection (Arnaldo Carvalho de Melo)
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 05f5ece7 6a1a77ba
...@@ -74,6 +74,7 @@ arch/*/include/uapi/asm/unistd*.h ...@@ -74,6 +74,7 @@ arch/*/include/uapi/asm/unistd*.h
arch/*/include/uapi/asm/perf_regs.h arch/*/include/uapi/asm/perf_regs.h
arch/*/lib/memcpy*.S arch/*/lib/memcpy*.S
arch/*/lib/memset*.S arch/*/lib/memset*.S
arch/*/include/asm/*features.h
include/linux/poison.h include/linux/poison.h
include/linux/hw_breakpoint.h include/linux/hw_breakpoint.h
include/uapi/linux/perf_event.h include/uapi/linux/perf_event.h
......
...@@ -15,7 +15,7 @@ TMP_DEST=$(mktemp -d) ...@@ -15,7 +15,7 @@ TMP_DEST=$(mktemp -d)
tar xf ${TARBALL} -C $TMP_DEST tar xf ${TARBALL} -C $TMP_DEST
rm -f ${TARBALL} rm -f ${TARBALL}
cd - > /dev/null cd - > /dev/null
make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1 make -C $TMP_DEST/perf*/tools/perf > /dev/null
RC=$? RC=$?
rm -rf ${TMP_DEST} rm -rf ${TMP_DEST}
exit $RC exit $RC
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment