aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/delayacct.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index 3a0b910386d1..63012fd39ae2 100644
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -14,6 +14,7 @@
#include <linux/delayacct.h>
#include <linux/module.h>
+DEFINE_STATIC_KEY_TRUE(delayacct_key);
int delayacct_on __read_mostly = 1; /* Delay accounting turned on/off */
struct kmem_cache *delayacct_cache;
@@ -28,6 +29,8 @@ void delayacct_init(void)
{
delayacct_cache = KMEM_CACHE(task_delay_info, SLAB_PANIC|SLAB_ACCOUNT);
delayacct_tsk_init(&init_task);
+ if (!delayacct_on)
+ static_branch_disable(&delayacct_key);
}
void __delayacct_tsk_init(struct task_struct *tsk)