From: Laura Abbott <labbott@redhat.com>
Date: Fri, 6 Jul 2018 00:49:40 +0000 (-0700)
Subject: arm64: Add build salt to the vDSO
X-Git-Tag: archive/raspbian/4.18.10-2+rpi1^2~56
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=784f4e6cb303a37f1cbc06ea11c11eb669c0ae0c;p=linux.git

arm64: Add build salt to the vDSO

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>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Gbp-Pq: Topic features/arm64
Gbp-Pq: Name arm64-add-build-salt-to-the-vdso.patch
---

diff --git a/arch/arm64/kernel/vdso/note.S b/arch/arm64/kernel/vdso/note.S
index b82c85e5d97..e20483b104d 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