diff options
| author | Will Deacon <will@kernel.org> | 2021-02-12 18:17:42 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-12 18:17:42 +0300 |
| commit | 1ffa9763828cf73a4d4eaa04c29a4a89fb0708c7 (patch) | |
| tree | 7ec6212946a5e583c37aac1d866ad2539754d1e6 /arch/arm64/kernel/Makefile | |
| parent | dcabe10d97f51d0ceca4ef54e607de85d665546f (diff) | |
| parent | f3cb097ad8888019e6d8777cb17bcee18ac6c2f6 (diff) | |
| download | linux-1ffa9763828cf73a4d4eaa04c29a4a89fb0708c7.tar.xz | |
Merge branch 'for-next/vdso' into for-next/core
vDSO build improvements.
* for-next/vdso:
arm64: Support running gen_vdso_offsets.sh with BSD userland.
arm64: do not descend to vdso directories twice
Diffstat (limited to 'arch/arm64/kernel/Makefile')
| -rw-r--r-- | arch/arm64/kernel/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 2262f0392857..ed65576ce710 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -59,9 +59,10 @@ obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o obj-$(CONFIG_ARM64_PTR_AUTH) += pointer_auth.o obj-$(CONFIG_ARM64_MTE) += mte.o +obj-y += vdso-wrap.o +obj-$(CONFIG_COMPAT_VDSO) += vdso32-wrap.o -obj-y += vdso/ probes/ -obj-$(CONFIG_COMPAT_VDSO) += vdso32/ +obj-y += probes/ head-y := head.o extra-y += $(head-y) vmlinux.lds |