[kernel] r18372 - in dists/sid/linux-2.6/debian: config patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Sat Dec 10 05:02:34 2011
New Revision: 18372

Log:
Deal with ABI changes in 3.1.5

struct clocksource changed but clocksource functions shouldn't be used
by OOT modules; ignore the change.

struct inet_peer changed; although it shouldn't be used by OOT modules
it does affect symbol versions for many of the networking core
functions.  Since the structure is only allocated in one place so we
can safely extend it instead of adding the new member in the middle.

Added:
   dists/sid/linux-2.6/debian/patches/debian/inetpeer-hide-ABI-change-in-3.1.5.patch
Modified:
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Sat Dec 10 04:19:10 2011	(r18371)
+++ dists/sid/linux-2.6/debian/config/defines	Sat Dec 10 05:02:34 2011	(r18372)
@@ -3,6 +3,8 @@
 ignore-changes:
  module:drivers/net/wireless/rt2x00/*
  module:fs/nfs/nfs
+ __clocksource_*
+ clocksource_*
 
 [base]
 arches:

Added: dists/sid/linux-2.6/debian/patches/debian/inetpeer-hide-ABI-change-in-3.1.5.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/inetpeer-hide-ABI-change-in-3.1.5.patch	Sat Dec 10 05:02:34 2011	(r18372)
@@ -0,0 +1,23 @@
+diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
+index e9ff3fc..7c73e84 100644
+--- a/include/net/inetpeer.h
++++ b/include/net/inetpeer.h
+@@ -35,7 +35,6 @@ struct inet_peer {
+ 
+ 	u32			metrics[RTAX_MAX];
+ 	u32			rate_tokens;	/* rate limiting for ICMP */
+-	int			redirect_genid;
+ 	unsigned long		rate_last;
+ 	unsigned long		pmtu_expires;
+ 	u32			pmtu_orig;
+@@ -60,6 +59,10 @@ struct inet_peer {
+ 	/* following fields might be frequently dirtied */
+ 	__u32			dtime;	/* the time of last use of not referenced entries */
+ 	atomic_t		refcnt;
++
++#ifndef __GENKSYMS__
++	int			redirect_genid;
++#endif
+ };
+ 
+ void			inet_initpeers(void) __init;

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Sat Dec 10 04:19:10 2011	(r18371)
+++ dists/sid/linux-2.6/debian/patches/series/base	Sat Dec 10 05:02:34 2011	(r18372)
@@ -85,3 +85,4 @@
 + bugfix/all/0003-staging-brcm80211-Remove-swaps-in-R_REG-and-W_REG-ma.patch
 + bugfix/all/0004-staging-brcm80211-restrict-register-access-method-fo.patch
 + bugfix/all/0005-staging-brcm80211-restrict-MIPS-dma-bug-workaround-t.patch
++ debian/inetpeer-hide-ABI-change-in-3.1.5.patch