From 29f1a23722330dd6ce355d5b768c0056f0ecbbb4 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 15 Jul 2018 23:45:49 +0100
Subject: [PATCH] init: Avoid ABI change for build salt

---
 debian/changelog                              |  1 +
 ...init-avoid-abi-change-for-build-salt.patch | 24 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 debian/patches/debian/init-avoid-abi-change-for-build-salt.patch

diff --git a/debian/changelog b/debian/changelog
index acb6bf72c..bd7ac09f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux (4.17.6-2) UNRELEASED; urgency=medium
     - kbuild: Add build salt to the kernel and modules
     - [arm64,powerpc,x86] Add build salt to the vDSO
     - Set BUILD_SALT equal to the release string
+  * init: Avoid ABI change for build salt
 
   [ Vagrant Cascadian ]
   * [riscv64] Build linux-libc-dev (Closes: #886440).
diff --git a/debian/patches/debian/init-avoid-abi-change-for-build-salt.patch b/debian/patches/debian/init-avoid-abi-change-for-build-salt.patch
new file mode 100644
index 000000000..0b207ee9d
--- /dev/null
+++ b/debian/patches/debian/init-avoid-abi-change-for-build-salt.patch
@@ -0,0 +1,24 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 15 Jul 2018 23:44:02 +0100
+Subject: init: Avoid ABI change for build salt
+Forwarded: not-needed
+
+<linux/build-salt.h> indirectly includes <linux/elf.h>, which
+apparently adds some type definitions that change the symbol
+version for init_uts_ns.
+
+Hide this change from genksyms.
+
+---
+--- a/init/version.c
++++ b/init/version.c
+@@ -7,7 +7,9 @@
+  */
+ 
+ #include <generated/compile.h>
++#ifndef __GENKSYMS__
+ #include <linux/build-salt.h>
++#endif
+ #include <linux/export.h>
+ #include <linux/uts.h>
+ #include <linux/utsname.h>
diff --git a/debian/patches/series b/debian/patches/series
index 02ee750f3..33de109fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -161,3 +161,4 @@ debian/wireless-disable-regulatory.db-direct-loading.patch
 # ABI maintenance
 debian/hid-avoid-abi-change-in-4.17.6.patch
 debian/dax-avoid-abi-change-in-4.17.6.patch
+debian/init-avoid-abi-change-for-build-salt.patch