Resolve ABI changes in 3.9.8

svn path=/dists/sid/linux/; revision=20298

3 files changed, 44 insertions, 0 deletions

diff --git a/debian/config/defines b/debian/config/defines
index 90501914e4bf..3f5114d32bce 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,10 +1,14 @@
 [abi]
 abiname: 1
 ignore-changes:
+ module:drivers/net/wireless/rtlwifi/rtlwifi
  module:drivers/scsi/qla2xxx/qla2xxx
  module:drivers/target/*
  module:drivers/usb/serial/*
+ module:net/ceph/libceph
  module:sound/pci/hda/*
+# Only for tc modules; don't think they are implemented OOT
+ psched_ratecfg_precompute
 
 [base]
 arches:
diff --git a/debian/patches/debian/perf-avoid-abi-change-in-3.9.8.patch b/debian/patches/debian/perf-avoid-abi-change-in-3.9.8.patch
new file mode 100644
index 000000000000..abc925aa9b55
--- /dev/null
+++ b/debian/patches/debian/perf-avoid-abi-change-in-3.9.8.patch
@@ -0,0 +1,39 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: perf: Avoid ABI change in 3.9.8
+Date: Sat, 29 Jun 2013 17:57:25 +0100
+Forwarded: not-needed
+
+mmap-related fields in struct perf_event moved to struct ring_buffer.
+struct perf_event is exposed to modules, but they probably didn't
+use those fields, so just add them back.  struct ring_buffer is not
+exposed to modules, so just hide that change from genksyms.
+
+
+
+--- a/include/linux/perf_event.h
++++ b/include/linux/perf_event.h
+@@ -405,6 +405,10 @@ struct perf_event {
+ 	struct mutex			mmap_mutex;
+ 	atomic_t			mmap_count;
+ 
++	/* unused, kept for ABI compatibility */
++	int				mmap_locked;
++	struct user_struct		*mmap_user;
++
+ 	struct ring_buffer		*rb;
+ 	struct list_head		rb_entry;
+ 
+--- a/kernel/events/internal.h
++++ b/kernel/events/internal.h
+@@ -31,9 +31,11 @@ struct ring_buffer {
+ 	spinlock_t			event_lock;
+ 	struct list_head		event_list;
+ 
++#ifndef __GENKSYMS__
+ 	atomic_t			mmap_count;
+ 	unsigned long			mmap_locked;
+ 	struct user_struct		*mmap_user;
++#endif
+ 
+ 	struct perf_event_mmap_page	*user_page;
+ 	void				*data_pages[0];
diff --git a/debian/patches/series b/debian/patches/series
index 66c60775f298..0fb77386490c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -110,3 +110,4 @@ debian/yama-disable-by-default.patch
 bugfix/all/fanotify-info-leak-in-copy_event_to_user.patch
 bugfix/all/drivers-cdrom-cdrom.c-use-kzalloc-for-failing-hardwa.patch
 bugfix/all/block-do-not-pass-disk-names-as-format-strings.patch
+debian/perf-avoid-abi-change-in-3.9.8.patch