Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca6c34ad authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman
Browse files

Revert "x86/vdso: Drop implicit common-page-size linker flag" 



This reverts commit 408d67a0.

The commit message in the 4.9 stable tree did not have a reference to
the upstream commit id.

Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e85fa7b2

arch/x86/entry/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ targets += $(vdso_img_sodbg) 
export CPPFLAGS_vdso.lds += -P -C



VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \

			-z max-page-size=4096

			-z max-page-size=4096 -z common-page-size=4096



$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE

	$(call if_changed,vdso)
@@ -95,7 +95,7 @@ CFLAGS_REMOVE_vvar.o = -pg 


CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds)

VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \

			   -z max-page-size=4096

			   -z max-page-size=4096 -z common-page-size=4096



# 64-bit objects to re-brand as x32

vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y))