forked from luck/tmp_suning_uos_patched
sched/debug: Add SCHED_WARN_ON()
Provide SCHED_WARN_ON as wrapper for WARN_ON_ONCE() to avoid CONFIG_SCHED_DEBUG wrappery. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
49bd21efe7
commit
9148a3a10e
@ -262,9 +262,7 @@ static inline struct rq *rq_of(struct cfs_rq *cfs_rq)
|
||||
|
||||
static inline struct task_struct *task_of(struct sched_entity *se)
|
||||
{
|
||||
#ifdef CONFIG_SCHED_DEBUG
|
||||
WARN_ON_ONCE(!entity_is_task(se));
|
||||
#endif
|
||||
SCHED_WARN_ON(!entity_is_task(se));
|
||||
return container_of(se, struct task_struct, se);
|
||||
}
|
||||
|
||||
@ -2369,7 +2367,7 @@ void task_numa_work(struct callback_head *work)
|
||||
unsigned long nr_pte_updates = 0;
|
||||
long pages, virtpages;
|
||||
|
||||
WARN_ON_ONCE(p != container_of(work, struct task_struct, numa_work));
|
||||
SCHED_WARN_ON(p != container_of(work, struct task_struct, numa_work));
|
||||
|
||||
work->next = work; /* protect against double add */
|
||||
/*
|
||||
@ -4474,7 +4472,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
|
||||
struct sched_entity *se = &p->se;
|
||||
struct cfs_rq *cfs_rq = cfs_rq_of(se);
|
||||
|
||||
WARN_ON(task_rq(p) != rq);
|
||||
SCHED_WARN_ON(task_rq(p) != rq);
|
||||
|
||||
if (rq->cfs.h_nr_running > 1) {
|
||||
u64 slice = sched_slice(cfs_rq, se);
|
||||
|
@ -15,6 +15,12 @@
|
||||
#include "cpudeadline.h"
|
||||
#include "cpuacct.h"
|
||||
|
||||
#ifdef CONFIG_SCHED_DEBUG
|
||||
#define SCHED_WARN_ON(x) WARN_ONCE(x, #x)
|
||||
#else
|
||||
#define SCHED_WARN_ON(x) ((void)(x))
|
||||
#endif
|
||||
|
||||
struct rq;
|
||||
struct cpuidle_state;
|
||||
|
||||
@ -1309,7 +1315,7 @@ static inline void idle_set_state(struct rq *rq,
|
||||
|
||||
static inline struct cpuidle_state *idle_get_state(struct rq *rq)
|
||||
{
|
||||
WARN_ON(!rcu_read_lock_held());
|
||||
SCHED_WARN_ON(!rcu_read_lock_held());
|
||||
return rq->idle_state;
|
||||
}
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user