summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/powerpc/pmu
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2020-07-18 15:43:55 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2020-07-18 15:43:55 +0300
commitef9f7cfaa50025068c69cdee8efccee12d9fabfc (patch)
treeafe8211215c04bd85763e1e37b079c9ef0f0355e /tools/testing/selftests/powerpc/pmu
parent61f879d97ce4510dd29d676a20d67692e3b34806 (diff)
parentf0479c4bcbd92d1a457d4a43bcab79f29d11334a (diff)
downloadlinux-ef9f7cfaa50025068c69cdee8efccee12d9fabfc.tar.xz
Merge branch 'fixes' into next
Merge our fixes branch, primarily to bring in the ebb selftests build fix and the pkey fix, which is a dependency for some future work.
Diffstat (limited to 'tools/testing/selftests/powerpc/pmu')
-rw-r--r--tools/testing/selftests/powerpc/pmu/ebb/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/powerpc/pmu/ebb/Makefile b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
index ca35dd8848b0..af3df79d8163 100644
--- a/tools/testing/selftests/powerpc/pmu/ebb/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
@@ -7,7 +7,7 @@ noarg:
# The EBB handler is 64-bit code and everything links against it
CFLAGS += -m64
-TMPOUT = $(OUTPUT)/
+TMPOUT = $(OUTPUT)/TMPDIR/
# Toolchains may build PIE by default which breaks the assembly
no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \
$(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)