[linux] 01/01: ehci: Fix ABI change in 3.16.7-ckt19
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Tue Nov 17 18:47:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch jessie
in repository linux.
commit 3576395a7906d8c152b5fbcf7efa81da5bf91be7
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Tue Nov 17 18:44:00 2015 +0000
ehci: Fix ABI change in 3.16.7-ckt19
---
debian/changelog | 1 +
.../ehci-fix-abi-change-in-3.16.7-ckt19.patch | 31 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 33 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 13afa5c..752839e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,6 +168,7 @@ linux (3.16.7-ckt19-1) UNRELEASED; urgency=medium
* netlink: Fix ABI change in 3.16.7-ckt18
* [x86] Enable PINCTRL_BAYTRAIL (Closes: #797949)
* firmware_class: Fix condition in directory search loop (Closes: #804862)
+ * ehci: Fix ABI change in 3.16.7-ckt19
-- Aurelien Jarno <aurel32 at debian.org> Sat, 03 Oct 2015 22:32:19 +0200
diff --git a/debian/patches/debian/ehci-fix-abi-change-in-3.16.7-ckt19.patch b/debian/patches/debian/ehci-fix-abi-change-in-3.16.7-ckt19.patch
new file mode 100644
index 0000000..ecd7480
--- /dev/null
+++ b/debian/patches/debian/ehci-fix-abi-change-in-3.16.7-ckt19.patch
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 17 Nov 2015 18:41:38 +0000
+Subject: ehci: Fix ABI change in 3.16.7-ckt19
+Forwarded: not-needed
+
+Move the new bitfield in struct ehci_hcd after the other bits, to
+avoid an ABI change. I doubt this is going to be used OOT but it's
+easy enough to do.
+
+---
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -215,7 +215,6 @@ struct ehci_hcd { /* one per controlle
+ /* SILICON QUIRKS */
+ unsigned no_selective_suspend:1;
+ unsigned has_fsl_port_bug:1; /* FreeScale */
+- unsigned has_fsl_hs_errata:1; /* Freescale HS quirk */
+ unsigned big_endian_mmio:1;
+ unsigned big_endian_desc:1;
+ unsigned big_endian_capbase:1;
+@@ -227,6 +226,10 @@ struct ehci_hcd { /* one per controlle
+ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */
+ unsigned need_oc_pp_cycle:1; /* MPC834X port power */
+ unsigned imx28_write_fix:1; /* For Freescale i.MX28 */
++#ifndef __GENKSYMS__
++ unsigned has_fsl_hs_errata:1; /* Freescale HS quirk */
++ /* 18 bits spare */
++#endif
+
+ /* required for usb32 quirk */
+ #define OHCI_CTRL_HCFS (3 << 6)
diff --git a/debian/patches/series b/debian/patches/series
index e378cc6..98440d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -640,3 +640,4 @@ bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
bugfix/all/rds-fix-race-condition-when-sending-a-message-on-unbound-socket.patch
bugfix/x86/kvm-x86-vmx-avoid-guest-host-dos-by-intercepting-ac.patch
bugfix/x86/kvm-x86-svm-intercept-ac-to-avoid-guest-host-exploit.patch
+debian/ehci-fix-abi-change-in-3.16.7-ckt19.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list