--- zzzz-none-000/linux-4.1.52/mm/vmstat.c	2018-05-28 02:26:45.000000000 +0000
+++ bcm63-7530ax-731/linux-4.1.52/mm/vmstat.c	2022-03-02 11:37:13.000000000 +0000
@@ -62,6 +62,15 @@
 }
 EXPORT_SYMBOL_GPL(all_vm_events);
 
+#if defined(CONFIG_AVM_POWERMETER)
+/**--------------------------------------------------------------------------------**\
+ * unprotected - for bh/irq-context
+\**--------------------------------------------------------------------------------**/
+void __all_vm_events(unsigned long *ret) {
+	sum_vm_events(ret);
+}
+#endif/*--- #if defined(CONFIG_AVM_POWERMETER) ---*/
+
 /*
  * Fold the foreign cpu events into our own.
  *
@@ -685,6 +694,9 @@
 #else
 #define TEXT_FOR_DMA32(xx)
 #endif
+#if defined(CONFIG_BCM_KF_ARM_BCM963XX) && defined(CONFIG_BCM_ZONE_ACP)
+#define TEXT_FOR_ACP(xx) xx "_acp",
+#endif
 
 #ifdef CONFIG_HIGHMEM
 #define TEXT_FOR_HIGHMEM(xx) xx "_high",
@@ -692,8 +704,15 @@
 #define TEXT_FOR_HIGHMEM(xx)
 #endif
 
+#if defined(CONFIG_BCM_KF_ARM_BCM963XX) && defined(CONFIG_BCM_ZONE_ACP)
+#define TEXTS_FOR_ZONES(xx) TEXT_FOR_DMA(xx) TEXT_FOR_DMA32(xx) TEXT_FOR_ACP(xx) \
+					xx "_normal", TEXT_FOR_HIGHMEM(xx) \
+					xx "_movable",
+					
+#else
 #define TEXTS_FOR_ZONES(xx) TEXT_FOR_DMA(xx) TEXT_FOR_DMA32(xx) xx "_normal", \
 					TEXT_FOR_HIGHMEM(xx) xx "_movable",
+#endif
 
 const char * const vmstat_text[] = {
 	/* enum zone_stat_item countes */