Commit 22ebd830 authored by Ben Hutchings's avatar Ben Hutchings

Avoid ABI change for changes in 3.2.42

svn path=/dists/sid/linux/; revision=19962
parent a1ca5838
From: Ben Hutchings <ben@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)
From: Ben Hutchings <ben@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;
From: Ben Hutchings <ben@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
};
......@@ -627,3 +627,6 @@ features/all/input-mt/Input-MT-Handle-frame-synchronization-in-core.patch
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment