[linux] 03/03: dm: Avoid ABI change in 3.2.95

[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
in repository linux.

commit 89c0ff9fdb9e33e914b02fe4aab6f2263d3b0ca4
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Nov 27 16:26:42 2017 +0000

    dm: Avoid ABI change in 3.2.95
---
 debian/changelog                                   |  1 +
 .../debian/dm-avoid-abi-change-in-3.2.95.patch     | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 738a50f..bc0fc51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -212,6 +212,7 @@ linux (3.2.96-1) UNRELEASED; urgency=medium
   * perf: Avoid ABI change in 3.2.95
   * mlx4*: Ignore ABI change
   * [rt] Update to 3.2.95-rt133
+  * dm: Avoid ABI change in 3.2.95
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 26 Nov 2017 20:43:54 +0000
 
diff --git a/debian/patches/debian/dm-avoid-abi-change-in-3.2.95.patch b/debian/patches/debian/dm-avoid-abi-change-in-3.2.95.patch
new file mode 100644
index 0000000..145086e
--- /dev/null
+++ b/debian/patches/debian/dm-avoid-abi-change-in-3.2.95.patch
@@ -0,0 +1,30 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 27 Nov 2017 16:24:53 +0000
+Subject: dm: Avoid ABI change in 3.2.95
+Forwarded: not-needed
+
+Commit 604407890ecf "dm: fix printk() rate limiting code" removed the
+global state for device-mapper log rate limiting.  Add it back so any
+old OOT modules using it will still work.
+
+---
+--- a/drivers/md/dm.c
++++ b/drivers/md/dm.c
+@@ -25,6 +25,17 @@
+ 
+ #define DM_MSG_PREFIX "core"
+ 
++#ifdef CONFIG_PRINTK
++/*
++ * ratelimit state to be used in DMXXX_LIMIT() (old modules only)
++ */
++DEFINE_RATELIMIT_STATE(dm_ratelimit_state,
++		       DEFAULT_RATELIMIT_INTERVAL,
++		       DEFAULT_RATELIMIT_BURST);
++EXPORT_SYMBOL(dm_ratelimit_state);
++#endif
++
++ /*
+ /*
+  * Cookies are numeric values sent with CHANGE and REMOVE
+  * uevents while resuming, removing or renaming the device.
diff --git a/debian/patches/series b/debian/patches/series
index 4a6ea96..fe9ac19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1185,3 +1185,4 @@ debian/sched-avoid-abi-change-in-3.2.94.patch
 debian/ip6_fib-avoid-abi-change-in-3.2.95.patch
 debian/libsas-avoid-abi-change-in-3.2.95.patch
 debian/perf-avoid-abi-change-in-3.2.95.patch
+debian/dm-avoid-abi-change-in-3.2.95.patch

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