From aa7fe253ee7e9977445e744b442c2cefa77226c8 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Wed, 29 Dec 2021 12:12:59 +0800 Subject: [PATCH] tick/nohz: Remove superflous check for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE mainline inclusion from mainline-5.14-rc1 commit 3f624314b3f7c580aa5844a8930befd71e2a287c category: feature feature: Deep isolation bugzilla: https://gitee.com/openeuler/kernel/issues/I4N00D CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3f624314b3f7c580aa5844a8930befd71e2a287c -------------------------------- The vtime_accounting_enabled_this_cpu() early check already makes what follows as dead code in the case of CONFIG_VIRT_CPU_ACCOUNTING_NATIVE. No need to keep the ifdeferry around. Signed-off-by: Frederic Weisbecker Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Link: https://lore.kernel.org/r/20210512232924.150322-4-frederic@kernel.org Signed-off-by: Yunfeng Ye Reviewed-by: Chao Liu Reviewed-by: Chen Hui Acked-by: Xie XiuQi Signed-off-by: Zheng Zengkai --- kernel/time/tick-sched.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index eea50baf9cb0..f9ec75c35ac5 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -1172,7 +1172,6 @@ unsigned long tick_nohz_get_idle_calls(void) static void tick_nohz_account_idle_ticks(struct tick_sched *ts) { -#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE unsigned long ticks; if (vtime_accounting_enabled_this_cpu()) @@ -1188,7 +1187,6 @@ static void tick_nohz_account_idle_ticks(struct tick_sched *ts) */ if (ticks && ticks < LONG_MAX) account_idle_ticks(ticks); -#endif } void tick_nohz_idle_restart_tick(void) -- GitLab