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

[Ben Hutchings]

Author: benh
Date: Thu Jun 28 04:55:23 2012
New Revision: 19225

Log:
driver core: Avoid ABI change for removal of __must_check

Added:
   dists/sid/linux/debian/patches/debian/driver-core-avoid-ABI-change-for-removal-of-__must_check.patch
Modified:
   dists/sid/linux/debian/patches/series

Added: dists/sid/linux/debian/patches/debian/driver-core-avoid-ABI-change-for-removal-of-__must_check.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/driver-core-avoid-ABI-change-for-removal-of-__must_check.patch	Thu Jun 28 04:55:23 2012	(r19225)
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: driver core: Avoid ABI change for removal of __must_check
+
+Surprisingly, __must_check contributes to the symbol version hash
+despite making no real difference to the function's ABI.
+
+--- a/include/linux/device.h
++++ b/include/linux/device.h
+@@ -510,8 +510,13 @@
+ 	struct dev_ext_attribute dev_attr_##_name = \
+ 		{ __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) }
+ 
++#ifdef __GENKSYMS__
++extern int __must_check device_create_file(struct device *device,
++					const struct device_attribute *entry);
++#else
+ extern int device_create_file(struct device *device,
+ 			      const struct device_attribute *entry);
++#endif
+ extern void device_remove_file(struct device *dev,
+ 			       const struct device_attribute *attr);
+ extern int __must_check device_create_bin_file(struct device *dev,

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Thu Jun 28 03:58:34 2012	(r19224)
+++ dists/sid/linux/debian/patches/series	Thu Jun 28 04:55:23 2012	(r19225)
@@ -369,3 +369,6 @@
 features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch
 
 bugfix/all/xen-netfront-teardown-the-device-before-unregistering-it.patch
+
+# Until next ABI bump
+debian/driver-core-avoid-ABI-change-for-removal-of-__must_check.patch