[linux] 01/04: ALSA: timer: Avoid ABI change in 3.2.97

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch wheezy-security-retpoline
in repository linux.

commit 123024cd1d0ccadcad2070fdca2d12b5b282dec4
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 16 20:49:22 2017 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 0e0eaba..0f901e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -151,6 +151,7 @@ linux (3.2.99-1) UNRELEASED; urgency=medium
   * proc: Fix ptrace mode in has_pid_permissions() (Closes: #887106)
   * SCSI: Avoid ABI change in 3.2.97
   * block: Avoid ABI change in 3.2.99
+  * ALSA: timer: Avoid ABI change in 3.2.97
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 07 Jan 2017 17:41:34 +0000
 
diff --git a/debian/patches/debian/alsa-timer-avoid-abi-change-in-3.2.97.patch b/debian/patches/debian/alsa-timer-avoid-abi-change-in-3.2.97.patch
new file mode 100644
index 0000000..6d48fa1
--- /dev/null
+++ b/debian/patches/debian/alsa-timer-avoid-abi-change-in-3.2.97.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 3.2.97
+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 8027f8b..19334e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1120,3 +1120,4 @@ bugfix/all/xfrm-fix-crash-in-xfrm_msg_getsa-netlink-handler.patch
 # ABI maintenance
 debian/scsi-avoid-abi-change-in-3.2.97.patch
 debian/block-avoid-abi-change-in-3.2.99.patch
+debian/alsa-timer-avoid-abi-change-in-3.2.97.patch

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