4.9-stable patches

added patches:
	sparc32-export-vac_cache_size-to-fix-build-error.patch

diff --git a/queue-4.9/revert-bluetooth-btusb-driver-to-enable-the-usb-wakeup.patch b/queue-4.9/revert-bluetooth-btusb-driver-to-enable-the-usb-wakeup.patch
index f3027c3abe71568a8e9f3de80f23117f16bad7be..89df4ded3894b82e281a8500c5a34e139f73749b 100644 (file)
--- a/queue-4.9/revert-bluetooth-btusb-driver-to-enable-the-usb-wakeup.patch
+++ b/queue-4.9/revert-bluetooth-btusb-driver-to-enable-the-usb-wakeup.patch
@@ -18,6 +18,7 @@ Cc: Marcel Holtmann <marcel@holtmann.org>
 Cc: Matthias Kaehlcke <mka@chromium.org>
 Reported-by: Guenter Roeck <linux@roeck-us.net>
 Reported-by: Brian Norris <briannorris@chromium.org>
+Acked-by: Brian Norris <briannorris@chromium.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/bluetooth/btusb.c |    5 -----

diff --git a/queue-4.9/series b/queue-4.9/series
index b455b3a46e5b2bd8c4383c599ee74ba3601a8167..fcbcaf0799ff40af9bb57ad0d6e736ca3bb274f3 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -105,3 +105,4 @@ bpf-adjust-insn_aux_data-when-patching-insns.patch
 bpf-fix-branch-pruning-logic.patch
 bpf-reject-out-of-bounds-stack-pointer-calculation.patch
 bpf-fix-incorrect-sign-extension-in-check_alu_op.patch
+sparc32-export-vac_cache_size-to-fix-build-error.patch

diff --git a/queue-4.9/sparc32-export-vac_cache_size-to-fix-build-error.patch b/queue-4.9/sparc32-export-vac_cache_size-to-fix-build-error.patch
new file mode 100644 (file)
index 0000000..88080d4
--- /dev/null
+++ b/queue-4.9/sparc32-export-vac_cache_size-to-fix-build-error.patch
@@ -0,0 +1,34 @@
+From 9d262d95114cf2e2ac5e0ff358347fa2e214eda5 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Sat, 1 Apr 2017 13:47:44 -0700
+Subject: sparc32: Export vac_cache_size to fix build error
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit 9d262d95114cf2e2ac5e0ff358347fa2e214eda5 upstream.
+
+sparc32:allmodconfig fails to build with the following error.
+
+ERROR: "vac_cache_size" [drivers/infiniband/sw/rxe/rdma_rxe.ko] undefined!
+
+Fixes: cb8864559631 ("infiniband: Fix alignment of mmap cookies ...")
+Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
+Cc: Doug Ledford <dledford@redhat.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/sparc/mm/srmmu.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/sparc/mm/srmmu.c
++++ b/arch/sparc/mm/srmmu.c
+@@ -54,6 +54,7 @@
+ enum mbus_module srmmu_modtype;
+ static unsigned int hwbug_bitmask;
+ int vac_cache_size;
++EXPORT_SYMBOL(vac_cache_size);
+ int vac_line_size;
+ 
+ extern struct resource sparc_iomap;