From patchwork Fri Jul 6 00:49:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10510485 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 18FC060532 for ; Fri, 6 Jul 2018 00:50:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A7FB2810E for ; Fri, 6 Jul 2018 00:50:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2F642834A; Fri, 6 Jul 2018 00:50:41 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, 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 9F8C42810E for ; Fri, 6 Jul 2018 00:50:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753921AbeGFAub (ORCPT ); Thu, 5 Jul 2018 20:50:31 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:45255 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753637AbeGFAtx (ORCPT ); Thu, 5 Jul 2018 20:49:53 -0400 Received: by mail-qt0-f195.google.com with SMTP id y5-v6so8705449qti.12 for ; Thu, 05 Jul 2018 17:49:53 -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=67hlObYZQvpyPrZPGFFFmsXvb23O2m/LLRXIOlSOTJM=; b=fZgv9ca0+1WdsvI70mXOR0oIUUdoglDjeL1V4fbKa1Y7TZmGe3H8VxIJjl9rdA1yrC fe0+ig7rDIJPc3uuoCRSGlJ7UifXkIjTzzPaPpn7O3CVeB+lv2/iddgrwP00kDRyNm+V 9P96+k980ng6EYyMqLBfS80NsdI9PdupO+FtE76pCgIt5qAPNJzt8ZA++o5gXXRzXp7+ kKaQo8VjIN+z4nLSWuXebPa5xaU16If7uPvh8wEV7OeIDFVYzGUmojXvjvLy4O7KRGGm Ozkg5wlQbEbXpHMCMm8sP8OUFBVcZUzQ+xW+Ek+TF2OASNmrWO6wxla0fMs8IqP8f7eZ zOPw== X-Gm-Message-State: APt69E05ynXDgOOhokjslVbOA6Wot5Gsl2z9xh19UTsy6at6qknIyLpS 1rqyYJV5wnxER8E1LCiWSPXi/Q== X-Google-Smtp-Source: AAOMgpcDXPWsVG/BRvKvP0SpuDTAEA0xzeu22Bn+U90IrrehylHhNmdMOa7spPnsVyw7LNI5+ZBI2g== X-Received: by 2002:a0c:9351:: with SMTP id e17-v6mr6973648qve.4.1530838193023; Thu, 05 Jul 2018 17:49:53 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::f0c1]) by smtp.gmail.com with ESMTPSA id q67-v6sm4675205qkb.16.2018.07.05.17.49.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 17:49:50 -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, linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCHv6 2/4] x86: Add build salt to the vDSO Date: Thu, 5 Jul 2018 17:49:38 -0700 Message-Id: <20180706004940.32587-3-labbott@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706004940.32587-1-labbott@redhat.com> References: <20180706004940.32587-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 needs to have a unique build id in a similar manner to the kernel and modules. Use the build salt macro. Acked-by: Andy Lutomirski Signed-off-by: Laura Abbott --- v6: Ack from Andy --- arch/x86/entry/vdso/vdso-note.S | 3 +++ arch/x86/entry/vdso/vdso32/note.S | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/entry/vdso/vdso-note.S b/arch/x86/entry/vdso/vdso-note.S index 79a071e4357e..79423170118f 100644 --- a/arch/x86/entry/vdso/vdso-note.S +++ b/arch/x86/entry/vdso/vdso-note.S @@ -3,6 +3,7 @@ * Here we can supply some information useful to userland. */ +#include #include #include #include @@ -10,3 +11,5 @@ ELFNOTE_START(Linux, 0, "a") .long LINUX_VERSION_CODE ELFNOTE_END + +BUILD_SALT diff --git a/arch/x86/entry/vdso/vdso32/note.S b/arch/x86/entry/vdso/vdso32/note.S index 9fd51f206314..e78047d119f6 100644 --- a/arch/x86/entry/vdso/vdso32/note.S +++ b/arch/x86/entry/vdso/vdso32/note.S @@ -4,6 +4,7 @@ * Here we can supply some information useful to userland. */ +#include #include #include @@ -14,6 +15,8 @@ ELFNOTE_START(Linux, 0, "a") .long LINUX_VERSION_CODE ELFNOTE_END +BUILD_SALT + #ifdef CONFIG_XEN /* * Add a special note telling glibc's dynamic linker a fake hardware