summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2020-04-20 18:14:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-29 16:33:15 +0200
commit000515184f6f2579f1931a8538f84dacda2d0be5 (patch)
tree56d935ef4990788cd1227592db36b7453eaa1e1d
parent5126bdeaf980b1dab8dba400001c234787a20afc (diff)
downloadlinux-stable-000515184f6f2579f1931a8538f84dacda2d0be5.tar.gz
linux-stable-000515184f6f2579f1931a8538f84dacda2d0be5.tar.bz2
linux-stable-000515184f6f2579f1931a8538f84dacda2d0be5.zip
tools/vm: fix cross-compile build
commit cf01699ee220c38099eb3e43ce3d10690c8b7060 upstream. Commit 7ed1c1901fe5 ("tools: fix cross-compile var clobbering") moved the setup of the CC variable to tools/scripts/Makefile.include to make the behavior consistent across all the tools Makefiles. As the vm tools missed the include we end up with the wrong CC in a cross-compiling evironment. Fixes: 7ed1c1901fe5 (tools: fix cross-compile var clobbering) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Martin Kelly <martin@martingkelly.com> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200416104748.25243-1-l.stach@pengutronix.de Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/vm/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/vm/Makefile b/tools/vm/Makefile
index 20f6cf04377f..9860622cbb15 100644
--- a/tools/vm/Makefile
+++ b/tools/vm/Makefile
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
# Makefile for vm tools
#
+include ../scripts/Makefile.include
+
TARGETS=page-types slabinfo page_owner_sort
LIB_DIR = ../lib/api