mfd/rcu: fix two implicit includes showing up on ARMrt-v4.12.14

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 73 insertions, 0 deletions

diff --git a/patches/mfd-fix-implicit-dependency-on-memset.patch b/patches/mfd-fix-implicit-dependency-on-memset.patch
new file mode 100644
index 00000000000000..083af2e34b2927
--- /dev/null
+++ b/patches/mfd-fix-implicit-dependency-on-memset.patch
@@ -0,0 +1,35 @@
+From 4e4335b10b1c38ff8f852f6916f787677712a0d6 Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Mon, 23 Oct 2017 12:42:37 -0400
+Subject: [PATCH] mfd: fix implicit dependency on memset
+
+We see this on an -rt version, but that doesn't change the fact
+that there is an implicit include here:
+
+drivers/mfd/atmel-smc.c: In function 'atmel_smc_cs_conf_init':
+drivers/mfd/atmel-smc.c:24:2: error: implicit declaration of function 'memset' [-Werror=implicit-function-declaration]
+drivers/mfd/atmel-smc.c:24:2: warning: incompatible implicit declaration of built-in function 'memset' [enabled by default]
+
+Fix it for everyone by explicitly adding the include for the memset
+call just a few lines below.
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ drivers/mfd/atmel-smc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/mfd/atmel-smc.c b/drivers/mfd/atmel-smc.c
+index 954cf0f66a31..c2f7069d537c 100644
+--- a/drivers/mfd/atmel-smc.c
++++ b/drivers/mfd/atmel-smc.c
+@@ -11,6 +11,7 @@
+  * published by the Free Software Foundation.
+  */
+ 
++#include <linux/string.h>
+ #include <linux/mfd/syscon/atmel-smc.h>
+ 
+ /**
+-- 
+2.14.1
+
diff --git a/patches/rcu-fix-implicit-include-for-ULONG_CMP_LT.patch b/patches/rcu-fix-implicit-include-for-ULONG_CMP_LT.patch
new file mode 100644
index 00000000000000..aa1b8779197ac4
--- /dev/null
+++ b/patches/rcu-fix-implicit-include-for-ULONG_CMP_LT.patch
@@ -0,0 +1,36 @@
+From d7fed5639e21e7e72b0f8e89d10b5b5ce90ab98a Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Mon, 23 Oct 2017 12:45:45 -0400
+Subject: [PATCH] rcu: fix implicit include for ULONG_CMP_LT
+
+We see this on an -rt variant of the kernel, but it does not seem
+that there is anything really -rt specific other than unmasking
+an implicit include dependency as follows:
+
+kernel/rcu/rcu_segcblist.c: In function 'rcu_segcblist_advance':
+kernel/rcu/rcu_segcblist.c:396:3: error: implicit declaration of function 'ULONG_CMP_LT' [-Werror=implicit-function-
+declaration]
+
+Add the include explicitly to ensure it is not an issue in any
+future kernels.
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ kernel/rcu/rcu_segcblist.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kernel/rcu/rcu_segcblist.c b/kernel/rcu/rcu_segcblist.c
+index 2b62a38b080f..73c0534ecb3e 100644
+--- a/kernel/rcu/rcu_segcblist.c
++++ b/kernel/rcu/rcu_segcblist.c
+@@ -22,6 +22,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/kernel.h>
++#include <linux/rcupdate.h>
+ #include <linux/interrupt.h>
+ 
+ #include "rcu_segcblist.h"
+-- 
+2.14.1
+
diff --git a/patches/series b/patches/series
index 6f3fef352ffad4..98522637b16a85 100644
--- a/patches/series
+++ b/patches/series
@@ -10,6 +10,8 @@
 # UPSTREAM FIXES, patches pending
 ############################################################
 timer-make-the-base-lock-raw.patch
+mfd-fix-implicit-dependency-on-memset.patch
+rcu-fix-implicit-include-for-ULONG_CMP_LT.patch
 
 ############################################################
 # Stuff broken upstream, patches submitted