diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index a185a35888ce..8e9e6891e9bc 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -154,7 +154,6 @@ struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf)
  * RQ-clock updating methods:
  */
 
-extern int update_irq_load_avg(u64 now, int cpu, struct rq *rq, int running);
 static void update_rq_clock_task(struct rq *rq, s64 delta)
 {
 /*
@@ -205,7 +204,7 @@ static void update_rq_clock_task(struct rq *rq, s64 delta)
 
 #if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)
 	if ((irq_delta + steal) && sched_feat(NONTASK_CAPACITY))
-		update_irq_load_avg(rq->clock, rq->cpu, rq, irq_delta + steal);
+		sched_rt_avg_update(rq, irq_delta + steal);
 #endif
 }
 
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 91983b85d224..9bbdcce7ef78 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3681,18 +3681,6 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq, bool update_freq)
 	return decayed || removed_load;
 }
 
-int update_irq_load_avg(u64 now, int cpu, struct rq *rq, int running)
-{
-	int ret;
-	ret = ___update_load_avg(now - running, cpu, &rq->avg_irq, 0, 0, NULL, NULL);
-	ret += ___update_load_avg(now, cpu, &rq->avg_irq, 1, 1, NULL, NULL);
-
-	if (ret)
-		___update_load_avg(now, cpu, &rq->avg_irq, 1, 1, NULL, NULL);
-
-	return ret;
-}
-
 int update_rt_rq_load_avg(u64 now, int cpu, struct rt_rq *rt_rq, int running)
 {
 	int ret;
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index d6797160510b..c818d6c23d46 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -937,7 +937,6 @@ struct rq {
 	u64 age_stamp;
 	u64 idle_stamp;
 	u64 avg_idle;
-	struct sched_avg avg_irq;
 
 	/* This is used to determine avg_idle's max value */
 	u64 max_idle_balance_cost;
@@ -2197,13 +2196,6 @@ cpu_util_freq(int cpu, struct sched_walt_cpu_load *walt_load)
 
 #else
 
-static inline unsigned long cpu_util_irq(int cpu)
-{
-	struct rq *rq = cpu_rq(cpu);
-
-	return rq->avg_irq.util_avg;
-}
-
 static inline unsigned long cpu_util_rt(int cpu)
 {
 	struct rt_rq *rt_rq = &(cpu_rq(cpu)->rt);