Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2449176yba; Mon, 15 Apr 2019 11:52:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqw51mA7LLzV+pdsVRd2C+WlI6VPIynFh5GPtobeBEAVULzBLk8YzorqgilmeQQYf66gZlbO X-Received: by 2002:a62:304:: with SMTP id 4mr76105785pfd.99.1555354358034; Mon, 15 Apr 2019 11:52:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555354358; cv=none; d=google.com; s=arc-20160816; b=xlGi7uVXrn4SI6LLADr3Md/GSvedtTW1nLJcioIImgpN4J/0m1C1WgUA+BqUcrw1lz 0UbsbU9XI+XpvLWBwct8CnBSN1upHEmXcALu54m1FZp1Wa2RchrMUWJBGpR1n59uwMJ+ iXc7Rm3zi/GTEdftEFNJCUp4c/DbUQx39waBaTzmfsPlwB5ZdfSjbLIZ5XrRMJ/r1Zk8 etR1F00PIPsr6aBhmTsI23lY8sxeevphCI9LROrzXjZ0uhhx2mOvd6qwcwNsm9PaP3nJ 1fTmlvVVpWCEYol48LhLnbbaczMfysvU8oa+EjC5qnIVvraTnUOayhfisva69xp71/qe marA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eHHtpNguk1YLlhFFMx1nX2KZ/bd9Lb0T6NAZ+GDCJLQ=; b=yfzvmOs+26prBrne7rTUuMEudJYECnEWJGC6l7R9zohfTJ8WLYiNOPwYt9xpC/cM+m gA2n93t144du1x2Q+wrO42fKURQPDiC4RlOfjrIFvaJvKvghe3HXJE1AxmoTsVK30pAe y1LtLTO9G3cDMYw4bpXVUL/KTw1klFRQJq1qTE4r84qov2NgN0JE9fbbRTr6Co7Xd3os XNbqYG2c/nYBNDxcDfr8hCqCn029mK4ItB/NMGJ9PTV4yY3faeMPIYOi/VMHmH9ZNV4L GJqZU59WHOf27n3R8tL+nPEROvfM8WiZ2bs+OP6cnCXfyfmaydDC9lQ7iNTLFKdfJRUw 1w0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HQC9KzBJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n1si30660153pld.280.2019.04.15.11.52.22; Mon, 15 Apr 2019 11:52:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HQC9KzBJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728254AbfDOSp7 (ORCPT + 99 others); Mon, 15 Apr 2019 14:45:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:48436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728477AbfDOSp4 (ORCPT ); Mon, 15 Apr 2019 14:45:56 -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 161B82087C; Mon, 15 Apr 2019 18:45:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555353955; bh=ZKsc/u79gCF19W1gng47cJuP2F4DmT+ttD+GGQxHtqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HQC9KzBJWZ70l1Nj00rOcl5VL9elZtos9X3Dr1tv0g71q/Hl04XRKQdEmaAdajBUs 62UMoUEwSBWUaVwWsVOI4fGDCgTZJ4x/BabbF8oAvjFMyWvOJ7BxO83cvHcHcno1i5 FTevpF79Eqk1L3Md/ouJ3mhFhkvaH7t96BG/iodk= 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.9 08/76] x86/vdso: Drop implicit common-page-size linker flag Date: Mon, 15 Apr 2019 20:43:32 +0200 Message-Id: <20190415183709.976412760@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183707.712011689@linuxfoundation.org> References: <20190415183707.712011689@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 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 2ae92c6b1de6..756dc9432d15 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 common-page-size=4096 + -z max-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 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