[linux] 03/03: swap: Avoid ABI change in 4.13.12

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit a2708107cedb7cabe734e9f61f75007ceedafd41
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Nov 12 01:09:18 2017 +0000

    swap: Avoid ABI change in 4.13.12
---
 debian/changelog                                   |  1 +
 .../debian/swap-avoid-abi-change-in-4.13.12.patch  | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9152946..096d892 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,7 @@ linux (4.13.12-1) UNRELEASED; urgency=medium
   * linux-image: Recommend apparmor, as systemd units with an AppArmor
     profile will fail without it (Closes: #880441)
   * [powerpc*] kvm: Ignore ABI change in 4.13.6 (fixes FTBFS)
+  * swap: Avoid ABI change in 4.13.12
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 04 Nov 2017 09:54:41 +0100
 
diff --git a/debian/patches/debian/swap-avoid-abi-change-in-4.13.12.patch b/debian/patches/debian/swap-avoid-abi-change-in-4.13.12.patch
new file mode 100644
index 0000000..1254d9d
--- /dev/null
+++ b/debian/patches/debian/swap-avoid-abi-change-in-4.13.12.patch
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 12 Nov 2017 01:03:55 +0000
+Subject: swap: Avoid ABI change in 4.13.12
+Forwarded: not-neede
+
+Commit 2628bd6fc052 "mm, swap: fix race between swap count
+continuation operations" added a field to struct swap_info_struct.
+swap_info_struct is always allocated in built-in code and modules
+won't use this new field, so move it to the end of the structure and
+hide it from genksyms.
+
+---
+--- a/include/linux/swap.h
++++ b/include/linux/swap.h
+@@ -246,12 +246,14 @@ struct swap_info_struct {
+ 					 * both locks need hold, hold swap_lock
+ 					 * first.
+ 					 */
++	struct work_struct discard_work; /* discard worker */
++	struct swap_cluster_list discard_clusters; /* discard clusters list */
++#ifndef __GENKSYMS__
+ 	spinlock_t cont_lock;		/*
+ 					 * protect swap count continuation page
+ 					 * list.
+ 					 */
+-	struct work_struct discard_work; /* discard worker */
+-	struct swap_cluster_list discard_clusters; /* discard clusters list */
++#endif
+ };
+ 
+ /* linux/mm/workingset.c */
diff --git a/debian/patches/series b/debian/patches/series
index dc4bf84..f7e0a40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -137,3 +137,4 @@ debian/dax-avoid-abi-change-in-4.13.5.patch
 debian/revert-bpf-one-perf-event-close-won-t-free-bpf-program-atta.patch
 debian/mac80211-avoid-abi-change-in-4.13.5.patch
 debian/keys-limit-abi-change-in-4.13.10.patch
+debian/swap-avoid-abi-change-in-4.13.12.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git