[linux] 01/02: ALSA: timer: Avoid ABI change in 4.13.13

[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 7cb3e39661100cc42d77476698f5413b78f09330
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 16 20:49:22 2017 +0000

    ALSA: timer: Avoid ABI change in 4.13.13
---
 debian/changelog                                   |  1 +
 .../alsa-timer-avoid-abi-change-in-4.13.13.patch   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 95b248b..a6b64ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,7 @@ linux (4.13.13-1) UNRELEASED; urgency=medium
   * [arm64,x86] net/wireless: Enable RTL8723BS as module (Closes: #881568)
   * [arm64] nvmem: Enable NVMEM_SUNXI_SID as module (Closes: #881567)
   * [x86] rmi4: Disable RMI4_SMB (Closes: #880471)
+  * ALSA: timer: Avoid ABI change in 4.13.13
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 04 Nov 2017 09:54:41 +0100
 
diff --git a/debian/patches/debian/alsa-timer-avoid-abi-change-in-4.13.13.patch b/debian/patches/debian/alsa-timer-avoid-abi-change-in-4.13.13.patch
new file mode 100644
index 0000000..e7a874a
--- /dev/null
+++ b/debian/patches/debian/alsa-timer-avoid-abi-change-in-4.13.13.patch
@@ -0,0 +1,25 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 16 Nov 2017 20:46:00 +0000
+Subject: ALSA: timer: Avoid ABI change in 4.13.13
+Forwarded: not-needed
+
+Commit 9b7d869ee5a7 ("ALSA: timer: Limit max instances per timer")
+added two new members to the end of struct snd_timer, and this changes
+ABI for many exported symbols.  However, snd_timer is always allocated
+in the snd-timer module, which is the same place the new members are
+used.  We can safely hide the change from genksyms.
+
+---
+--- a/include/sound/timer.h
++++ b/include/sound/timer.h
+@@ -90,8 +90,10 @@ struct snd_timer {
+ 	struct list_head ack_list_head;
+ 	struct list_head sack_list_head; /* slow ack list head */
+ 	struct tasklet_struct task_queue;
++#ifndef __GENKSYMS__
+ 	int max_instances;	/* upper limit of timer instances */
+ 	int num_instances;	/* current number of timer instances */
++#endif
+ };
+ 
+ struct snd_timer_instance {
diff --git a/debian/patches/series b/debian/patches/series
index 676c0b9..e12e8aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,3 +148,4 @@ 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
+debian/alsa-timer-avoid-abi-change-in-4.13.13.patch

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