diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 13:59:31 +0200 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 13:59:31 +0200 |
commit | 18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a (patch) | |
tree | 4c1732a2dddb246f0d39a492cbf8e6db31f3af3e /arch/riscv/Makefile | |
parent | perf stat: Add topdown metrics in the default perf stat on the hybrid machine (diff) | |
parent | Linux 5.19 (diff) | |
download | linux-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.tar.xz linux-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes that went upstream via acme/perf/urgent and to get
to v5.19.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/riscv/Makefile')
-rw-r--r-- | arch/riscv/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index a4c46a03d2e2..81029d40a672 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -111,7 +111,7 @@ PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@ $(if $(CONFIG_COMPAT),$(Q)$(MAKE) \ - $(build)=arch/riscv/kernel/compat_vdso $@) + $(build)=arch/riscv/kernel/compat_vdso compat_$@) ifeq ($(KBUILD_EXTMOD),) ifeq ($(CONFIG_MMU),y) |