summaryrefslogtreecommitdiffstats
path: root/scripts/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-28 07:45:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-28 07:45:41 +0100
commit4a248f85b3dd8e010ff8335755c927130e9b0764 (patch)
tree751b9b9404881bb098213427427e4f9e30de5641 /scripts/Makefile
parentae016b9da7bcb3b4ddd95afc406ddf5b27a859d5 (diff)
parent7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 (diff)
downloadlinux-4a248f85b3dd8e010ff8335755c927130e9b0764.tar.bz2
Merge 5.17-rc6 into driver-core-next
We need the driver core fix in here as well for future changes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/Makefile')
-rw-r--r--scripts/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile b/scripts/Makefile
index ecd3acacd0ec..ce5aa9030b74 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -25,7 +25,7 @@ HOSTCFLAGS_sorttable.o += -I$(srctree)/tools/arch/x86/include
HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED
endif
-ifdef CONFIG_DYNAMIC_FTRACE
+ifdef CONFIG_BUILDTIME_MCOUNT_SORT
HOSTCFLAGS_sorttable.o += -DMCOUNT_SORT_ENABLED
endif