Commit f3b9e8e4 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'sched_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fix from Borislav Petkov:

 - Fix a couple of kernel-doc warnings

* tag 'sched_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: fix cid_lock kernel-doc warnings
parents 011e33ee 0019a2d4
...@@ -11492,7 +11492,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count) ...@@ -11492,7 +11492,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count)
#ifdef CONFIG_SCHED_MM_CID #ifdef CONFIG_SCHED_MM_CID
/** /*
* @cid_lock: Guarantee forward-progress of cid allocation. * @cid_lock: Guarantee forward-progress of cid allocation.
* *
* Concurrency ID allocation within a bitmap is mostly lock-free. The cid_lock * Concurrency ID allocation within a bitmap is mostly lock-free. The cid_lock
...@@ -11501,7 +11501,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count) ...@@ -11501,7 +11501,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count)
*/ */
DEFINE_RAW_SPINLOCK(cid_lock); DEFINE_RAW_SPINLOCK(cid_lock);
/** /*
* @use_cid_lock: Select cid allocation behavior: lock-free vs spinlock. * @use_cid_lock: Select cid allocation behavior: lock-free vs spinlock.
* *
* When @use_cid_lock is 0, the cid allocation is lock-free. When contention is * When @use_cid_lock is 0, the cid allocation is lock-free. When contention is
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment