diff options
| author | Sasha Levin <sashal@kernel.org> | 2019-05-14 21:18:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-16 20:43:44 +0300 |
| commit | ca6c34ad76eeb865021433e00f7a630ecf74c530 (patch) | |
| tree | 310310389b48af88bb5fd5a621dbd390141b2116 | |
| parent | e85fa7b29d1fdafe267017e70d50cad85faaa9dc (diff) | |
| download | linux-ca6c34ad76eeb865021433e00f7a630ecf74c530.tar.xz | |
Revert "x86/vdso: Drop implicit common-page-size linker flag"
This reverts commit 408d67a0fecf4cfe7869f518211ae278ee44376e.
The commit message in the 4.9 stable tree did not have a reference to
the upstream commit id.
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/x86/entry/vdso/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 756dc9432d15..2ae92c6b1de6 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -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)) |