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=-14.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 8BF6CC10F11 for ; Wed, 24 Apr 2019 18:05:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58D8E20835 for ; Wed, 24 Apr 2019 18:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556129123; bh=kWXPJfvY06BkJm3Sk+VbZxZO6Ewi67Fd68yjaxGDEms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ryjgXtTzzpbsMRjEz/58nydSrwp94kd19wr7AebRMuvSD5z9hptnOdJb+IwPpTUZ1 o1HcVXDqBFWL+l2tmN6puERKZF2hBt73+iPR1mdfyUj0UzXtvJ+4PCiz51J1kkGZM2 2uKCJIE7UPj+s9gmbfDYMbpqyD3RT2Dad/55qy0E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390309AbfDXSFV (ORCPT ); Wed, 24 Apr 2019 14:05:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:43898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388887AbfDXRSr (ORCPT ); Wed, 24 Apr 2019 13:18:47 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 E8B64218B0; Wed, 24 Apr 2019 17:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126326; bh=kWXPJfvY06BkJm3Sk+VbZxZO6Ewi67Fd68yjaxGDEms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=08owCiGQhgAMWdlx/GV2ktFojhf9CKR6M+baL2RKwekdVVPYA7bJFVwDh0Bmuhnwu qZ9+l/hv6VdyUJFS+HyXYl5tm6Bn1u6Thk++Yg3GBECdl+SGL9kJfbIKf7thfjX1U1 ooHKGbqIh4hsuItOP19IQhzEVlxPgSL5x75mu89A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Golovin , Bill Wendling , Rui Ueyama , Nick Desaulniers , Borislav Petkov , Andy Lutomirski , Andi Kleen , Fangrui Song , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , x86-ml , Nathan Chancellor , Sasha Levin Subject: [PATCH 4.4 073/168] x86/vdso: Drop implicit common-page-size linker flag Date: Wed, 24 Apr 2019 19:08:37 +0200 Message-Id: <20190424170928.124540980@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@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 commit ac3e233d29f7f77f28243af0132057d378d3ea58 upstream. GNU linker's -z common-page-size's default value is based on the target architecture. arch/x86/entry/vdso/Makefile sets it to the architecture default, which is implicit and redundant. Drop it. Fixes: 2aae950b21e4 ("x86_64: Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu") Reported-by: Dmitry Golovin Reported-by: Bill Wendling Suggested-by: Dmitry Golovin Suggested-by: Rui Ueyama Signed-off-by: Nick Desaulniers Signed-off-by: Borislav Petkov Acked-by: Andy Lutomirski Cc: Andi Kleen Cc: Fangrui Song Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20181206191231.192355-1-ndesaulniers@google.com Link: https://bugs.llvm.org/show_bug.cgi?id=38774 Link: https://github.com/ClangBuiltLinux/linux/issues/31 Signed-off-by: Nathan Chancellor 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 84c4a7105c2a..297dda4d5947 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -42,7 +42,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 common-page-size=4096 + -z max-page-size=4096 $(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE $(call if_changed,vdso) @@ -89,7 +89,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 common-page-size=4096 + -z max-page-size=4096 # 64-bit objects to re-brand as x32 vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y)) -- 2.19.1