Skip to content

Commit d1895c1

Browse files
t-8chjmberg-intel
authored andcommitted
x86/um: fix vDSO installation
The generic vDSO installation logic used by 'make vdso_install' requires that $(vdso-install-y) is defined by the top-level architecture Makefile and that it contains a path relative to the root of the tree. For UML neither of these is satisfied. Move the definition of $(vdso-install-y) to a place which is included by the arch/um/Makefile and use the full relative path. Fixes: f1c2bb8 ("um: implement a x86_64 vDSO") Signed-off-by: Thomas Weißschuh <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 92d5c5c commit d1895c1

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

arch/x86/Makefile.um

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ ELF_FORMAT := elf64-x86-64
6060
LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib64
6161
LINK-y += -m64
6262

63+
vdso-install-y += arch/x86/um/vdso/vdso.so.dbg
64+
6365
endif

arch/x86/um/vdso/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# Building vDSO images for x86.
44
#
55

6-
vdso-install-y += vdso.so
7-
86
# files to link into the vdso
97
vobjs-y := vdso-note.o um_vdso.o
108

0 commit comments

Comments
 (0)