]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Feb 2018 17:04:38 +0000 (18:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Feb 2018 17:04:38 +0000 (18:04 +0100)
added patches:
usb-move-usb_uhci_big_endian_-out-of-usb_support.patch

queue-4.9/series
queue-4.9/usb-move-usb_uhci_big_endian_-out-of-usb_support.patch [new file with mode: 0644]

index 7aaf2cb0f831b283aa5557accb1eeb524074f0ee..f5b333e6c0342df9e7a095f22487da0ba4916e62 100644 (file)
@@ -29,6 +29,7 @@ alsa-hda-realtek-pci-quirk-for-fujitsu-u7x7.patch
 alsa-usb-audio-add-implicit-fb-quirk-for-behringer-ufx1204.patch
 alsa-seq-fix-racy-pool-initializations.patch
 mvpp2-fix-multicast-address-filter.patch
+usb-move-usb_uhci_big_endian_-out-of-usb_support.patch
 powerpc-fix-build-errors-in-stable-tree.patch
 ib-qib-fix-comparison-error-with-qperf-compare-swap-test.patch
 ib-mlx4-fix-incorrectly-releasing-steerable-ud-qps-when-have-only-eth-ports.patch
diff --git a/queue-4.9/usb-move-usb_uhci_big_endian_-out-of-usb_support.patch b/queue-4.9/usb-move-usb_uhci_big_endian_-out-of-usb_support.patch
new file mode 100644 (file)
index 0000000..4865059
--- /dev/null
@@ -0,0 +1,71 @@
+From ec897569ad7dbc6d595873a487c3fac23f463f76 Mon Sep 17 00:00:00 2001
+From: James Hogan <jhogan@kernel.org>
+Date: Wed, 31 Jan 2018 22:24:45 +0000
+Subject: usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT
+
+From: James Hogan <jhogan@kernel.org>
+
+commit ec897569ad7dbc6d595873a487c3fac23f463f76 upstream.
+
+Move the Kconfig symbols USB_UHCI_BIG_ENDIAN_MMIO and
+USB_UHCI_BIG_ENDIAN_DESC out of drivers/usb/host/Kconfig, which is
+conditional upon USB && USB_SUPPORT, so that it can be freely selected
+by platform Kconfig symbols in architecture code.
+
+For example once the MIPS_GENERIC platform selects are fixed in commit
+2e6522c56552 ("MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN"), the MIPS
+32r6_defconfig warns like so:
+
+warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
+warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_DESC which has unmet direct dependencies (USB_SUPPORT && USB)
+
+Fixes: 2e6522c56552 ("MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN")
+Signed-off-by: James Hogan <jhogan@kernel.org>
+Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Cc: Paul Burton <paul.burton@mips.com>
+Cc: linux-usb@vger.kernel.org
+Cc: linux-mips@linux-mips.org
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Patchwork: https://patchwork.linux-mips.org/patch/18559/
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/Kconfig      |    8 ++++++++
+ drivers/usb/host/Kconfig |    8 --------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/usb/Kconfig
++++ b/drivers/usb/Kconfig
+@@ -19,6 +19,14 @@ config USB_EHCI_BIG_ENDIAN_MMIO
+ config USB_EHCI_BIG_ENDIAN_DESC
+       bool
++config USB_UHCI_BIG_ENDIAN_MMIO
++      bool
++      default y if SPARC_LEON
++
++config USB_UHCI_BIG_ENDIAN_DESC
++      bool
++      default y if SPARC_LEON
++
+ menuconfig USB_SUPPORT
+       bool "USB support"
+       depends on HAS_IOMEM
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -628,14 +628,6 @@ config USB_UHCI_PLATFORM
+       bool
+       default y if ARCH_VT8500
+-config USB_UHCI_BIG_ENDIAN_MMIO
+-      bool
+-      default y if SPARC_LEON
+-
+-config USB_UHCI_BIG_ENDIAN_DESC
+-      bool
+-      default y if SPARC_LEON
+-
+ config USB_FHCI_HCD
+       tristate "Freescale QE USB Host Controller support"
+       depends on OF_GPIO && QE_GPIO && QUICC_ENGINE