diff --git a/kernel/kernel_config-4.12.x-aarch64 b/kernel/kernel_config-4.12.x-aarch64
index d4b454380..a36d005dd 100644
--- a/kernel/kernel_config-4.12.x-aarch64
+++ b/kernel/kernel_config-4.12.x-aarch64
@@ -105,7 +105,8 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem
diff --git a/kernel/kernel_config-4.12.x-x86_64 b/kernel/kernel_config-4.12.x-x86_64
index 1aaf09933..a72449f5e 100644
--- a/kernel/kernel_config-4.12.x-x86_64
+++ b/kernel/kernel_config-4.12.x-x86_64
@@ -124,7 +124,8 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem
diff --git a/kernel/kernel_config-4.4.x-aarch64 b/kernel/kernel_config-4.4.x-aarch64
index adda35344..80809ab50 100644
--- a/kernel/kernel_config-4.4.x-aarch64
+++ b/kernel/kernel_config-4.4.x-aarch64
@@ -95,7 +95,8 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem
diff --git a/kernel/kernel_config-4.4.x-x86_64 b/kernel/kernel_config-4.4.x-x86_64
index cdd0c8cb2..c7575db81 100644
--- a/kernel/kernel_config-4.4.x-x86_64
+++ b/kernel/kernel_config-4.4.x-x86_64
@@ -122,7 +122,8 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem
diff --git a/kernel/kernel_config-4.9.x-aarch64 b/kernel/kernel_config-4.9.x-aarch64
index 31a3b124f..1712a49f8 100644
--- a/kernel/kernel_config-4.9.x-aarch64
+++ b/kernel/kernel_config-4.9.x-aarch64
@@ -104,7 +104,8 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem
diff --git a/kernel/kernel_config-4.9.x-x86_64 b/kernel/kernel_config-4.9.x-x86_64
index 2bf8dd4db..e8586d572 100644
--- a/kernel/kernel_config-4.9.x-x86_64
+++ b/kernel/kernel_config-4.9.x-x86_64
@@ -125,7 +125,8 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem