[kernel] r19962 - in dists/sid/linux/debian/patches: . debian

[Ben Hutchings]

Author: benh
Date: Sun Mar 31 23:47:47 2013
New Revision: 19962

Log:
Avoid ABI change for changes in 3.2.42

Added:
   dists/sid/linux/debian/patches/debian/inet_frag-avoid-abi-change-in-3.2.42.patch
   dists/sid/linux/debian/patches/debian/skb-avoid-abi-change-in-3.2.42.patch
   dists/sid/linux/debian/patches/debian/tracing-avoid-abi-change-in-3.2.42.patch
Modified:
   dists/sid/linux/debian/patches/series

Added: dists/sid/linux/debian/patches/debian/inet_frag-avoid-abi-change-in-3.2.42.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/inet_frag-avoid-abi-change-in-3.2.42.patch	Sun Mar 31 23:47:47 2013	(r19962)
@@ -0,0 +1,19 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: inet_frag: Avoid ABI change in 3.2.42
+Date: Mon, 01 Apr 2013 00:45:25 +0100
+
+Hide an added #include from genksyms, as it will otherwise change
+symbol versions.
+---
+--- a/net/ipv4/inet_fragment.c
++++ b/net/ipv4/inet_fragment.c
+@@ -21,7 +21,9 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/slab.h>
+ 
++#ifndef __GENKSYMS__
+ #include <net/sock.h>
++#endif
+ #include <net/inet_frag.h>
+ 
+ static void inet_frag_secret_rebuild(unsigned long dummy)

Added: dists/sid/linux/debian/patches/debian/skb-avoid-abi-change-in-3.2.42.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/skb-avoid-abi-change-in-3.2.42.patch	Sun Mar 31 23:47:47 2013	(r19962)
@@ -0,0 +1,26 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: skb: avoid ABI change in 3.2.42
+Date: Sun, 31 Mar 2013 21:48:35 +0100
+
+commit 16fad69cfe4a 'tcp: fix skb_availroom()' (backported into 3.2.42)
+changes the name and semantics of a field in struct sk_buff.
+
+However, this field is private to the TCP, so hide the change from
+genksyms.
+
+---
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -455,7 +455,12 @@ struct sk_buff {
+ 	union {
+ 		__u32		mark;
+ 		__u32		dropcount;
++		/* For use by TCP only */
++#ifdef __GENKSYMS__
++		__u32		avail_size;
++#else
+ 		__u32		reserved_tailroom;
++#endif
+ 	};
+ 
+ 	__u16			vlan_tci;

Added: dists/sid/linux/debian/patches/debian/tracing-avoid-abi-change-in-3.2.42.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/tracing-avoid-abi-change-in-3.2.42.patch	Sun Mar 31 23:47:47 2013	(r19962)
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben at decadent.org.uk>:
+Subject: tracing: Avoid ABI change in 3.2.42
+Date: Sun, 31 Mar 2013 23:48:07 +0100
+
+Two new fields were added to struct tracer by commit 613f04a0f51e
+'tracing: Prevent buffer overwrite disabled for latency tracers'.
+
+This structure definition is not available to OOT modules and the
+functions it's used with are not exported at all, but unfortunately it
+ends up affecting the symbol versions of various functions that may be
+legitimately used to OOT modules.
+
+Hide the changes from genksyms.
+---
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -272,13 +272,17 @@ struct tracer {
+ 	/* If you handled the flag setting, return 0 */
+ 	int			(*set_flag)(u32 old_flags, u32 bit, int set);
+ 	/* Return 0 if OK with change, else return non-zero */
++#ifndef __GENKSYMS__
+ 	int			(*flag_changed)(struct tracer *tracer,
+ 						u32 mask, int set);
++#endif
+ 	struct tracer		*next;
+ 	struct tracer_flags	*flags;
+ 	int			print_max;
+ 	int			use_max_tr;
++#ifndef __GENKSYMS__
+ 	bool			enabled;
++#endif
+ };
+ 
+ 

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Mar 31 20:41:11 2013	(r19961)
+++ dists/sid/linux/debian/patches/series	Sun Mar 31 23:47:47 2013	(r19962)
@@ -627,3 +627,6 @@
 features/all/input-mt/Input-MT-Add-in-kernel-tracking.patch
 features/all/input-mt/Input-add-support-for-Cypress-PS-2-Trackpads.patch
 features/all/input-mt/Input-cypress_ps2-fix-trackpadi-found-in-Dell-XPS12.patch
+debian/skb-avoid-abi-change-in-3.2.42.patch
+debian/tracing-avoid-abi-change-in-3.2.42.patch
+debian/inet_frag-avoid-abi-change-in-3.2.42.patch