From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1529AC04E53 for ; Wed, 15 May 2019 11:15:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD2E72084E for ; Wed, 15 May 2019 11:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918948; bh=3dMdubc3fnkI4z6VbCojTb2u4IhQBd4DzL3jTUJC2IQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nS+WiQI5a0LNdMtRyJMC6n6np5rAqwo1A1R7UkI8V5UBXbLW/BsL+NqsC91obx9C4 /v1V4Zsxd5R+Muv4BBkXclNUbiB1KuSsZsTnumEbwhndj9ZaAJaE8cItgRT3zZyX83 oY69glNRR7PS9+YVdL6YH3lxlKR7cYwneUa5H/tc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730345AbfEOLPr (ORCPT ); Wed, 15 May 2019 07:15:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:52188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727380AbfEOLPj (ORCPT ); Wed, 15 May 2019 07:15:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 134BC20843; Wed, 15 May 2019 11:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918938; bh=3dMdubc3fnkI4z6VbCojTb2u4IhQBd4DzL3jTUJC2IQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iewD5jWvhtkes9jf1agOz5uVCNRZrYHC1hX5u7lOWD+3KpnahFIQXHg78bmN7DjiU lLhETj0W1Gm9K7iovNcY6dsjSuuHCQ/RD/f2uI6kxoIIknQmMsOVdTmRbqLhnTrWFj QRt7TUhKosOoRtDMfJXyOwBiC9VxuYgLKo3qzjNI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sasha Levin Subject: [PATCH 4.9 34/51] Revert "x86/vdso: Drop implicit common-page-size linker flag" Date: Wed, 15 May 2019 12:56:09 +0200 Message-Id: <20190515090626.730665433@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090616.669619870@linuxfoundation.org> References: <20190515090616.669619870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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