Avoid symbol version changes for some binary-compatible structure changes

svn path=/dists/sid/linux-2.6/; revision=18998
This commit is contained in:
Ben Hutchings 2012-05-12 13:52:25 +00:00
parent 5f9b292b8a
commit 88590a0642
3 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,14 @@
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index e689b47..cc2eefd 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -458,7 +458,9 @@ struct sk_buff {
union {
__u32 mark;
__u32 dropcount;
+#ifndef __GENKSYMS__
__u32 avail_size;
+#endif
};
__u16 vlan_tci;

View File

@ -0,0 +1,15 @@
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 64cec8d..605092f 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -128,8 +128,10 @@ struct usb_hcd {
unsigned wireless:1; /* Wireless USB HCD */
unsigned authorized_default:1;
unsigned has_tt:1; /* Integrated TT in root hub */
+#ifndef __GENKSYMS__
unsigned broken_pci_sleep:1; /* Don't put the
controller in PCI-D3 for system sleep */
+#endif
int irq; /* irq allocated */
void __iomem *regs; /* device memory/io */

View File

@ -189,6 +189,8 @@
+ debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch
+ debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch
+ debian/efi-avoid-ABI-change.patch
+ debian/skbuff-avoid-ABI-change-in-3.2.17.patch
+ debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch
+ bugfix/all/ext4-Report-max_batch_time-option-correctly.patch
+ bugfix/all/brcm80211-smac-pass-missing-argument-to-brcms_b_mute.patch