--- zzzz-none-000/linux-4.1.38/include/linux/cpumask.h	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/include/linux/cpumask.h	2020-11-25 10:06:48.000000000 +0000
@@ -121,32 +121,32 @@
 
 #if NR_CPUS == 1
 /* Uniprocessor.  Assume all masks are "1". */
-static inline unsigned int cpumask_first(const struct cpumask *srcp)
+static inline unsigned int cpumask_first(const struct cpumask *srcp __attribute__((unused)))
 {
 	return 0;
 }
 
 /* Valid inputs for n are -1 and 0. */
-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
+static inline unsigned int cpumask_next(int n, const struct cpumask *srcp __attribute__((unused)))
 {
 	return n+1;
 }
 
-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
+static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp __attribute__((unused)))
 {
 	return n+1;
 }
 
 static inline unsigned int cpumask_next_and(int n,
-					    const struct cpumask *srcp,
-					    const struct cpumask *andp)
+					    const struct cpumask *srcp __attribute__((unused)),
+					    const struct cpumask *andp __attribute__((unused)))
 {
 	return n+1;
 }
 
 /* cpu must be a valid cpu, ie 0, so there's no other choice. */
-static inline unsigned int cpumask_any_but(const struct cpumask *mask,
-					   unsigned int cpu)
+static inline unsigned int cpumask_any_but(const struct cpumask *mask __attribute__((unused)),
+					   unsigned int cpu __attribute__((unused)))
 {
 	return 1;
 }
@@ -160,8 +160,13 @@
 	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
 #define for_each_cpu_not(cpu, mask)		\
 	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
+#if defined(CONFIG_BCM_KF_CPP_SUPPORT)
+#define for_each_cpu_and(cpu, mask, ttt)	\
+	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask, (void)ttt)
+#else
 #define for_each_cpu_and(cpu, mask, and)	\
 	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask, (void)and)
+#endif
 #else
 /**
  * cpumask_first - get the first cpu in a cpumask
@@ -666,39 +671,42 @@
 
 #define this_cpu_cpumask_var_ptr(x) this_cpu_ptr(x)
 
-static inline bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)
+static inline bool alloc_cpumask_var(cpumask_var_t *mask __maybe_unused, gfp_t flags __maybe_unused)
 {
 	return true;
 }
 
-static inline bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,
-					  int node)
+static inline bool alloc_cpumask_var_node(cpumask_var_t *mask __maybe_unused,
+					  gfp_t flags __maybe_unused,
+					  int node __maybe_unused)
 {
 	return true;
 }
 
-static inline bool zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)
+static inline bool zalloc_cpumask_var(cpumask_var_t *mask,
+				      gfp_t flags __maybe_unused)
 {
 	cpumask_clear(*mask);
 	return true;
 }
 
-static inline bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,
-					  int node)
+static inline bool zalloc_cpumask_var_node(cpumask_var_t *mask,
+					   gfp_t flags __maybe_unused,
+					   int node __maybe_unused)
 {
 	cpumask_clear(*mask);
 	return true;
 }
 
-static inline void alloc_bootmem_cpumask_var(cpumask_var_t *mask)
+static inline void alloc_bootmem_cpumask_var(cpumask_var_t *mask __maybe_unused)
 {
 }
 
-static inline void free_cpumask_var(cpumask_var_t mask)
+static inline void free_cpumask_var(cpumask_var_t mask __maybe_unused)
 {
 }
 
-static inline void free_bootmem_cpumask_var(cpumask_var_t mask)
+static inline void free_bootmem_cpumask_var(cpumask_var_t mask __maybe_unused)
 {
 }
 #endif /* CONFIG_CPUMASK_OFFSTACK */
@@ -738,7 +746,7 @@
 	((struct cpumask *)(1 ? (bitmap)				\
 			    : (void *)sizeof(__check_is_bitmap(bitmap))))
 
-static inline int __check_is_bitmap(const unsigned long *bitmap)
+static inline int __check_is_bitmap(const unsigned long *bitmap __maybe_unused)
 {
 	return 1;
 }