[linux] 02/04: ip6_fib: Avoid ABI change in 4.9.51

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch stretch
in repository linux.

commit 210362fbd8a6997e89612e03701fd4fd40330fa4
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Sep 25 22:54:11 2017 +0100

    ip6_fib: Avoid ABI change in 4.9.51
    
    This indirectly changed huge numbers of symbol versions, so really
    needed to be fixed.
---
 debian/changelog                                   |  1 +
 .../ip6_fib-avoid-abi-change-in-4.9.51.patch       | 23 ++++++++++++++++++++++
 debian/patches/series                              |  5 +++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed4528e..be4d03c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,7 @@ linux (4.9.51-1) UNRELEASED; urgency=medium
     - Make enum loongson_cpu_type more clear
   * [ppc64el] Invalidate ERAT on powersave wakeup for POWER9, thanks to
     Michael Neuling (Closes: #868887)
+  * ip6_fib: Avoid ABI change in 4.9.51
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 19 Sep 2017 00:38:28 +0100
 
diff --git a/debian/patches/debian/ip6_fib-avoid-abi-change-in-4.9.51.patch b/debian/patches/debian/ip6_fib-avoid-abi-change-in-4.9.51.patch
new file mode 100644
index 0000000..f79a7e8
--- /dev/null
+++ b/debian/patches/debian/ip6_fib-avoid-abi-change-in-4.9.51.patch
@@ -0,0 +1,23 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 25 Sep 2017 22:49:55 +0100
+Subject: ip6_fib: Avoid ABI change in 4.9.51
+Forwarded: not-needed
+
+Commit c5cff8561d2d "ipv6: add rcu grace period before freeing
+fib6_node" added an rcu_head field to the end of struct fib6_node.
+As this structure is always allocated and freed inside of the ipv6
+module (or built-in code), we can safely hide it from genksyms.
+
+---
+--- a/include/net/ip6_fib.h
++++ b/include/net/ip6_fib.h
+@@ -68,7 +68,9 @@ struct fib6_node {
+ 	__u16			fn_flags;
+ 	int			fn_sernum;
+ 	struct rt6_info		*rr_ptr;
++#ifndef __GENKSYMS__
+ 	struct rcu_head		rcu;
++#endif
+ };
+ 
+ #ifndef CONFIG_IPV6_SUBTREES
diff --git a/debian/patches/series b/debian/patches/series
index b70b385..bdd33c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -150,8 +150,6 @@ bugfix/powerpc/powerpc-remove-mac-on-linux-hooks.patch
 bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
 bugfix/all/module-disable-matching-missing-version-crc.patch
 
-# ABI maintenance
-
 # Tools bug fixes
 bugfix/all/usbip-document-tcp-wrappers.patch
 bugfix/all/kbuild-fix-recordmcount-dependency.patch
@@ -173,3 +171,6 @@ bugfix/all/liblockdep-enable-wall-by-default.patch
 bugfix/all/liblockdep-fix-unused-value-warnings.patch
 bugfix/all/liblockdep-fix-set-but-not-used-warnings.patch
 bugfix/all/liblockdep-fix-defined-but-not-used-warning-for-init.patch
+
+# ABI maintenance
+debian/ip6_fib-avoid-abi-change-in-4.9.51.patch

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