From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 10 Apr 2018 14:12:04 +0000 (+0200)
Subject: 4.16-stable patches
X-Git-Tag: v4.16.2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=acbf42abb2c279959374c643abd4c07f4038abf9;p=thirdparty%2Fkernel%2Fstable-queue.git

4.16-stable patches

added patches:
	sparc64-oracle-dax-driver-depends-on-sparc64.patch
---

diff --git a/queue-4.16/series b/queue-4.16/series
new file mode 100644
index 00000000000..3018aaef8be
--- /dev/null
+++ b/queue-4.16/series
@@ -0,0 +1 @@
+sparc64-oracle-dax-driver-depends-on-sparc64.patch
diff --git a/queue-4.16/sparc64-oracle-dax-driver-depends-on-sparc64.patch b/queue-4.16/sparc64-oracle-dax-driver-depends-on-sparc64.patch
new file mode 100644
index 00000000000..ac10f4ad9e9
--- /dev/null
+++ b/queue-4.16/sparc64-oracle-dax-driver-depends-on-sparc64.patch
@@ -0,0 +1,45 @@
+From 9c548bb5823dfcf7a16c6e65976d84d9581208c9 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Mon, 26 Feb 2018 15:21:18 -0800
+Subject: sparc64: Oracle DAX driver depends on SPARC64
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit 9c548bb5823dfcf7a16c6e65976d84d9581208c9 upstream.
+
+sparc:allmodconfig fails to build as follows.
+
+ERROR: "mdesc_release" [drivers/sbus/char/oradax.ko] undefined!
+ERROR: "sun4v_hvapi_register" [drivers/sbus/char/oradax.ko] undefined!
+ERROR: "mdesc_get_property" [drivers/sbus/char/oradax.ko] undefined!
+ERROR: "mdesc_node_by_name" [drivers/sbus/char/oradax.ko] undefined!
+ERROR: "mdesc_grab" [drivers/sbus/char/oradax.ko] undefined!
+ERROR: "sun4v_ccb_info" [drivers/sbus/char/oradax.ko] undefined!
+ERROR: "sun4v_ccb_submit" [drivers/sbus/char/oradax.ko] undefined!
+ERROR: "sun4v_ccb_kill" [drivers/sbus/char/oradax.ko] undefined!
+
+The symbols are only available with SPARC64 builds, thus the driver
+depends on it.
+
+Fixes: dd0273284c74 ("sparc64: Oracle DAX driver")
+Cc: Kees Cook <keescook@chromium.org>
+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>
+
+---
+ drivers/sbus/char/Kconfig |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/sbus/char/Kconfig
++++ b/drivers/sbus/char/Kconfig
+@@ -72,7 +72,8 @@ config DISPLAY7SEG
+ 
+ config ORACLE_DAX
+ 	tristate "Oracle Data Analytics Accelerator"
+-	default m if SPARC64
++	depends on SPARC64
++	default m
+ 	help
+ 	 Driver for Oracle Data Analytics Accelerator, which is
+ 	 a coprocessor that performs database operations in hardware.