lkml.org 
[lkml]   [2019]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 34/51] Revert "x86/vdso: Drop implicit common-page-size linker flag"
    Date
    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>
    ---
    arch/x86/entry/vdso/Makefile | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
    index 0d3ebdfa07396..cec8cb28eabae 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))
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-15 13:16    [W:3.468 / U:0.768 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site