--- zzzz-none-000/linux-4.1.38/include/linux/vmstat.h	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/include/linux/vmstat.h	2020-11-25 10:06:48.000000000 +0000
@@ -53,27 +53,31 @@
 
 extern void all_vm_events(unsigned long *);
 
+#if defined(CONFIG_AVM_POWERMETER)
+extern void __all_vm_events(unsigned long *ret);
+#endif/*--- #if defined(CONFIG_AVM_POWERMETER) ---*/
+
 extern void vm_events_fold_cpu(int cpu);
 
 #else
 
 /* Disable counters */
-static inline void count_vm_event(enum vm_event_item item)
+static inline void count_vm_event(enum vm_event_item item __maybe_unused)
 {
 }
-static inline void count_vm_events(enum vm_event_item item, long delta)
+static inline void count_vm_events(enum vm_event_item item __maybe_unused, long delta __maybe_unused)
 {
 }
-static inline void __count_vm_event(enum vm_event_item item)
+static inline void __count_vm_event(enum vm_event_item item __maybe_unused)
 {
 }
-static inline void __count_vm_events(enum vm_event_item item, long delta)
+static inline void __count_vm_events(enum vm_event_item item __maybe_unused, long delta __maybe_unused)
 {
 }
-static inline void all_vm_events(unsigned long *ret)
+static inline void all_vm_events(unsigned long *ret __maybe_unused)
 {
 }
-static inline void vm_events_fold_cpu(int cpu)
+static inline void vm_events_fold_cpu(int cpu __maybe_unused)
 {
 }
 
@@ -178,6 +182,9 @@
 #ifdef CONFIG_ZONE_DMA32
 		zone_page_state(&zones[ZONE_DMA32], item) +
 #endif
+#if defined(CONFIG_BCM_KF_ARM_BCM963XX) && defined(CONFIG_BCM_ZONE_ACP)
+		zone_page_state(&zones[ZONE_ACP], item) +
+#endif
 #ifdef CONFIG_HIGHMEM
 		zone_page_state(&zones[ZONE_HIGHMEM], item) +
 #endif
@@ -277,8 +284,8 @@
 			struct per_cpu_pageset *pset) { }
 #endif		/* CONFIG_SMP */
 
-static inline void __mod_zone_freepage_state(struct zone *zone, int nr_pages,
-					     int migratetype)
+static inline void __mod_zone_freepage_state(struct zone *zone __maybe_unused, int nr_pages __maybe_unused,
+					     int migratetype __maybe_unused)
 {
 	__mod_zone_page_state(zone, NR_FREE_PAGES, nr_pages);
 	if (is_migrate_cma(migratetype))