[kernel] r19398 - in dists/sid/linux/debian: config patches patches/debian

[Ben Hutchings]

Author: benh
Date: Tue Sep 25 14:16:49 2012
New Revision: 19398

Log:
perf: Hide ABI change in 3.2.30

Added:
   dists/sid/linux/debian/patches/debian/perf-hide-abi-change-in-3.2.30.patch
Modified:
   dists/sid/linux/debian/config/defines
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/config/defines
==============================================================================
--- dists/sid/linux/debian/config/defines	Tue Sep 25 01:31:06 2012	(r19397)
+++ dists/sid/linux/debian/config/defines	Tue Sep 25 14:16:49 2012	(r19398)
@@ -1,7 +1,6 @@
 [abi]
 abiname: 4
 ignore-changes:
- perf_*
  xprt_*
 
 [base]

Added: dists/sid/linux/debian/patches/debian/perf-hide-abi-change-in-3.2.30.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/perf-hide-abi-change-in-3.2.30.patch	Tue Sep 25 14:16:49 2012	(r19398)
@@ -0,0 +1,23 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: perf: Hide ABI change in 3.2.30
+
+<linux/perf_events.h> is included by many source files but we don't
+want to bump the ABI number again right now.
+
+The new member (atomic_long_t refcount) has the same size as the old
+(struct file *filp) and neither should be needed by OOT modules (if
+they make use of perf_events at all).  So pretend this didn't happen.
+--- a/include/linux/perf_event.h
++++ b/include/linux/perf_event.h
+@@ -794,7 +794,11 @@ struct perf_event {
+ 	struct hw_perf_event		hw;
+ 
+ 	struct perf_event_context	*ctx;
++#ifdef __GENKSYMS__
++	struct file			*filp;
++#else
+ 	atomic_long_t			refcount;
++#endif
+ 
+ 	/*
+ 	 * These accumulate total time (in nanoseconds) that children

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Tue Sep 25 01:31:06 2012	(r19397)
+++ dists/sid/linux/debian/patches/series	Tue Sep 25 14:16:49 2012	(r19398)
@@ -396,3 +396,4 @@
 bugfix/x86/drm-i915-i8xx-interrupt-handler.patch
 features/arm/ahci-Add-JMicron-362-device-IDs.patch
 bugfix/all/speakup-lower-default-software-speech-rate.patch
+debian/perf-hide-abi-change-in-3.2.30.patch