From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/kernel/sched/sched.h | 72 +----------------------------------
1 files changed, 3 insertions(+), 69 deletions(-)
diff --git a/kernel/kernel/sched/sched.h b/kernel/kernel/sched/sched.h
index 61e804c..9e798c5 100644
--- a/kernel/kernel/sched/sched.h
+++ b/kernel/kernel/sched/sched.h
@@ -996,7 +996,6 @@
unsigned long cpu_capacity_orig;
struct callback_head *balance_callback;
- unsigned char balance_flags;
unsigned char nohz_idle_balance;
unsigned char idle_balance;
@@ -1027,10 +1026,6 @@
/* This is used to determine avg_idle's max value */
u64 max_idle_balance_cost;
-
-#ifdef CONFIG_HOTPLUG_CPU
- struct rcuwait hotplug_wait;
-#endif
#endif /* CONFIG_SMP */
#ifdef CONFIG_IRQ_TIME_ACCOUNTING
@@ -1082,12 +1077,6 @@
/* Must be inspected within a rcu lock section */
struct cpuidle_state *idle_state;
#endif
-
-#ifdef CONFIG_SMP
- unsigned int nr_pinned;
-#endif
- unsigned int push_busy;
- struct cpu_stop_work push_work;
ANDROID_VENDOR_DATA_ARRAY(1, 96);
ANDROID_OEM_DATA_ARRAY(1, 16);
@@ -1286,9 +1275,6 @@
rq->clock_update_flags &= (RQCF_REQ_SKIP|RQCF_ACT_SKIP);
rf->clock_update_flags = 0;
#endif
-#ifdef CONFIG_SMP
- SCHED_WARN_ON(rq->balance_callback);
-#endif
}
static inline void rq_unpin_lock(struct rq *rq, struct rq_flags *rf)
@@ -1448,9 +1434,6 @@
#ifdef CONFIG_SMP
-#define BALANCE_WORK 0x01
-#define BALANCE_PUSH 0x02
-
extern int migrate_swap(struct task_struct *p, struct task_struct *t,
int cpu, int scpu);
static inline void
@@ -1460,13 +1443,12 @@
{
lockdep_assert_held(&rq->lock);
- if (unlikely(head->next || (rq->balance_flags & BALANCE_PUSH)))
+ if (unlikely(head->next))
return;
head->func = (void (*)(struct callback_head *))func;
head->next = rq->balance_callback;
rq->balance_callback = head;
- rq->balance_flags |= BALANCE_WORK;
}
#define rcu_dereference_check_sched_domain(p) \
@@ -1795,7 +1777,6 @@
#define WF_FORK 0x02 /* Child wakeup after fork */
#define WF_MIGRATED 0x04 /* Internal use, task got migrated */
#define WF_ON_CPU 0x08 /* Wakee is on_cpu */
-#define WF_LOCK_SLEEPER 0x10 /* Wakeup spinlock "sleeper" */
#define WF_ANDROID_VENDOR 0x1000 /* Vendor specific for Android */
/*
@@ -1880,13 +1861,10 @@
void (*task_woken)(struct rq *this_rq, struct task_struct *task);
void (*set_cpus_allowed)(struct task_struct *p,
- const struct cpumask *newmask,
- u32 flags);
+ const struct cpumask *newmask);
void (*rq_online)(struct rq *rq);
void (*rq_offline)(struct rq *rq);
-
- struct rq *(*find_lock_rq)(struct task_struct *p, struct rq *rq);
#endif
void (*task_tick)(struct rq *rq, struct task_struct *p, int queued);
@@ -1970,38 +1948,13 @@
extern struct task_struct *pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf);
extern struct task_struct *pick_next_task_idle(struct rq *rq);
-#define SCA_CHECK 0x01
-#define SCA_MIGRATE_DISABLE 0x02
-#define SCA_MIGRATE_ENABLE 0x04
-
#ifdef CONFIG_SMP
extern void update_group_capacity(struct sched_domain *sd, int cpu);
extern void trigger_load_balance(struct rq *rq);
-extern void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_mask, u32 flags);
-
-static inline struct task_struct *get_push_task(struct rq *rq)
-{
- struct task_struct *p = rq->curr;
-
- lockdep_assert_held(&rq->lock);
-
- if (rq->push_busy)
- return NULL;
-
- if (p->nr_cpus_allowed == 1)
- return NULL;
-
- if (p->migration_disabled)
- return NULL;
-
- rq->push_busy = true;
- return get_task_struct(p);
-}
-
-extern int push_cpu_stop(void *arg);
+extern void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_mask);
extern unsigned long __read_mostly max_load_balance_interval;
#endif
@@ -2045,15 +1998,6 @@
extern void resched_curr(struct rq *rq);
extern void resched_cpu(int cpu);
-
-#ifdef CONFIG_PREEMPT_LAZY
-extern void resched_curr_lazy(struct rq *rq);
-#else
-static inline void resched_curr_lazy(struct rq *rq)
-{
- resched_curr(rq);
-}
-#endif
extern struct rt_bandwidth def_rt_bandwidth;
extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
@@ -2417,16 +2361,6 @@
static inline void nohz_balance_exit_idle(struct rq *rq) { }
#endif
-#define MDF_PUSH 0x01
-
-static inline bool is_migration_disabled(struct task_struct *p)
-{
-#ifdef CONFIG_SMP
- return p->migration_disabled;
-#else
- return false;
-#endif
-}
#ifdef CONFIG_SMP
static inline
--
Gitblit v1.6.2