From patchwork Thu Mar 29 18:01:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10316053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D9FA60383 for ; Thu, 29 Mar 2018 18:42:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21D092A49A for ; Thu, 29 Mar 2018 18:42:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 165F82A4A6; Thu, 29 Mar 2018 18:42:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9BAA2A49A for ; Thu, 29 Mar 2018 18:42:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751398AbeC2SB1 (ORCPT ); Thu, 29 Mar 2018 14:01:27 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35128 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbeC2SBY (ORCPT ); Thu, 29 Mar 2018 14:01:24 -0400 Received: by mail-pg0-f65.google.com with SMTP id j3so3548540pgf.2 for ; Thu, 29 Mar 2018 11:01:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=I5p1pXFvwN/qDYvjgHIf+MljBYGAAu12lm/Jj/aDCkY=; b=rJn1aZvGB4FcoR4l5O7FBL8hcRtYAW20u9FhldbTIrzeDJ0Bg4Pj65mOuGA969b/fQ erCYzMcvQ4CW1HyNd6lUe2jtAjojlwlxE7+7vddXgIIRM/twFzSmgst5k2QvdUyG4xvT 2J4vhf3C9/u9NR/RoG7S4RTvPm5FVHOYdUQJDhRFF/patqe4cU70Cy6f3L/UZMkr7TgV bkNGi3lq20uyACrCdBGQ1Le7kH2VPjlpvf+3jcqcKkkrY075v0vLKZ3jpbYmYUSkuVak AbSccWI/e49nBw7Tudq62FNRECL2RCHqjGMtpy+GuyZEJJebdloWNzvr7yx+aIqjdT1I /HdQ== X-Gm-Message-State: AElRT7EOtTP7OWWH6XIAA2kjva3I5Ah4X2m75c9/9Rl5LyOkCB1lKgfj 6uZRC29qIcaVjQA6IhymzxOtBg== X-Google-Smtp-Source: AIpwx48PYkxW3aKjCuAVcCm/W5as3X94r6CXFU08C6ZLsxKxWusCXMrLg/eI3K7NkBWjqUZh/l4xJg== X-Received: by 2002:a17:902:1a4:: with SMTP id b33-v6mr9406498plb.303.1522346483848; Thu, 29 Mar 2018 11:01:23 -0700 (PDT) Received: from localhost.localdomain.utopia.net ([2601:602:9802:a8dc::19fb]) by smtp.gmail.com with ESMTPSA id m21sm4762432pgn.0.2018.03.29.11.01.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Mar 2018 11:01:22 -0700 (PDT) From: Laura Abbott To: Andy Lutomirski , mjw@fedoraproject.org, "H . J . Lu" , Masahiro Yamada Cc: Laura Abbott , Linus Torvalds , X86 ML , linux-kernel@vger.kernel.org, Nick Clifton , Cary Coutant , linux-kbuild@vger.kernel.org Subject: [RFCv2 PATCH 3/3] x86/vdso: Add build salt to the vDSO Date: Thu, 29 Mar 2018 11:01:12 -0700 Message-Id: <20180329180112.11055-4-labbott@redhat.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180329180112.11055-1-labbott@redhat.com> References: <20180329180112.11055-1-labbott@redhat.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The vDSO is linked separately from the kernel and modules. Ensure it picks up the comment section, if available. Signed-off-by: Laura Abbott --- v2: Updated name --- arch/x86/entry/vdso/vdso-layout.lds.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/entry/vdso/vdso-layout.lds.S b/arch/x86/entry/vdso/vdso-layout.lds.S index acfd5ba7d943..7c78dd39aae8 100644 --- a/arch/x86/entry/vdso/vdso-layout.lds.S +++ b/arch/x86/entry/vdso/vdso-layout.lds.S @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include +#include /* * Linker script for vDSO. This is an ELF shared object prelinked to @@ -95,6 +96,8 @@ SECTIONS .altinstructions : { *(.altinstructions) } :text .altinstr_replacement : { *(.altinstr_replacement) } :text + BUILD_ID_SALT + /DISCARD/ : { *(.discard) *(.discard.*)