driver core: Avoid ABI change for removal of __must_check

svn path=/dists/sid/linux/; revision=19225
This commit is contained in:
Ben Hutchings 2012-06-28 04:55:23 +00:00
parent f2cb3f8d78
commit d8814e3523
2 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,22 @@
From: Ben Hutchings <ben@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,

View File

@ -369,3 +369,6 @@ features/arm/ARM-fix-Kconfig-warning-for-HAVE_BPF_JIT.patch
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