diff --git a/include/linux/sli.h b/include/linux/sli.h
index 370c6fb79..32c901b87 100755
--- a/include/linux/sli.h
+++ b/include/linux/sli.h
@@ -132,6 +132,7 @@ int  sli_schedlat_max_show(struct seq_file *m, struct cgroup *cgrp);
 ssize_t cgroup_sli_control_write(struct kernfs_open_file *of, char *buf,
 				 size_t nbytes, loff_t off);
 int cgroup_sli_control_show(struct seq_file *sf, void *v);
+void sli_check_longsys(struct task_struct *tsk);
 void sli_update_tick(struct task_struct *tsk);
 
 struct sli_notify_ctx* sctx_alloc(void);
diff --git a/kernel/cgroup/sli.c b/kernel/cgroup/sli.c
index 42f7a2af8..be0b3f0db 100755
--- a/kernel/cgroup/sli.c
+++ b/kernel/cgroup/sli.c
@@ -531,11 +531,13 @@ out:
 	rcu_read_unlock();
 }
 
-#ifdef CONFIG_SCHED_INFO
 void sli_check_longsys(struct task_struct *tsk)
 {
 	long delta;
 
+	if (!static_branch_likely(&sli_enabled))
+		return;
+
 	if (tsk->sched_class != &fair_sched_class)
 		return ;
 
@@ -559,7 +561,6 @@ void sli_check_longsys(struct task_struct *tsk)
 	delta = rq_clock(task_rq(tsk)) - tsk->sched_info.kernel_exec_start;
 	sli_schedlat_stat(tsk, SCHEDLAT_LONGSYS, delta);
 }
-#endif
 
 static void sli_proactive_monitor_work(struct work_struct *work)
 {
@@ -642,13 +643,6 @@ void sli_update_tick(struct task_struct *tsk)
 {
 	struct cgroup *cgrp;
 
-	if (!static_branch_likely(&sli_enabled))
-		return;
-
-#ifdef CONFIG_SCHED_INFO
-	sli_check_longsys(tsk);
-#endif
-
 	if (!static_branch_likely(&sli_monitor_enabled))
 		return;
 
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 28699c824..3c2730edd 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3697,6 +3697,9 @@ void scheduler_tick(void)
 	calc_global_load_tick(rq);
 	psi_task_tick(rq);
 
+#ifdef CONFIG_CGROUP_SLI
+	sli_check_longsys(curr);
+#endif
 	rq_unlock(rq, &rf);
 
 	perf_event_task_tick();
@@ -3786,6 +3789,9 @@ static void sched_tick_remote(struct work_struct *work)
 	curr->sched_class->task_tick(rq, curr, 0);
 
 	calc_load_nohz_remote(rq);
+#ifdef CONFIG_CGROUP_SLI
+	sli_check_longsys(curr);
+#endif
 out_unlock:
 	rq_unlock_irq(rq, &rf);
 out_requeue: