summaryrefslogtreecommitdiffstats
path: root/0004-arm64-Add-build-salt-to-the-vDSO.patch
diff options
context:
space:
mode:
Diffstat (limited to '0004-arm64-Add-build-salt-to-the-vDSO.patch')
-rw-r--r--0004-arm64-Add-build-salt-to-the-vDSO.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/0004-arm64-Add-build-salt-to-the-vDSO.patch b/0004-arm64-Add-build-salt-to-the-vDSO.patch
new file mode 100644
index 000000000..48367e79b
--- /dev/null
+++ b/0004-arm64-Add-build-salt-to-the-vDSO.patch
@@ -0,0 +1,49 @@
+From de9537aca25d53d9b44e7ec9a9952ebd77d69cd1 Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Tue, 3 Jul 2018 16:01:24 -0700
+Subject: [PATCHv6 4/4] arm64: Add build salt to the vDSO
+Cc: Andy Lutomirski <luto@kernel.org>
+To: mjw@fedoraproject.org
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+To: H. J. Lu <hjl.tools@gmail.com>
+Cc: X86 ML <x86@kernel.org>
+Cc: linux-kernel@vger.kernel.org
+To: Masahiro Yamada <yamada.masahiro@socionext.com>
+Cc: Nick Clifton <nickc@redhat.com>
+Cc: Cary Coutant <ccoutant@gmail.com>
+Cc: linux-kbuild@vger.kernel.org
+Cc: linuxppc-dev@lists.ozlabs.org
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+To: Catalin Marinas <catalin.marinas@arm.com>
+To: Will Deacon <will.deacon@arm.com>
+Cc: linux-arm-kernel@lists.infradead.org
+
+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: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+v6: Remove the semi-colon, Ack from Will
+---
+ arch/arm64/kernel/vdso/note.S | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm64/kernel/vdso/note.S b/arch/arm64/kernel/vdso/note.S
+index b82c85e5d972..e20483b104d9 100644
+--- a/arch/arm64/kernel/vdso/note.S
++++ b/arch/arm64/kernel/vdso/note.S
+@@ -22,7 +22,10 @@
+ #include <linux/uts.h>
+ #include <linux/version.h>
+ #include <linux/elfnote.h>
++#include <linux/build-salt.h>
+
+ ELFNOTE_START(Linux, 0, "a")
+ .long LINUX_VERSION_CODE
+ ELFNOTE_END
++
++BUILD_SALT
+--
+2.17.1
+