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

torvalds · torvalds · commit f3b9e8e4c848 · 2023-05-14T07:50:34.000-07:00
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
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
@@ -11492,7 +11492,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count)
 
 #ifdef CONFIG_SCHED_MM_CID
 
-/**
+/*
  * @cid_lock: Guarantee forward-progress of cid allocation.
  *
  * 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)
  */
 DEFINE_RAW_SPINLOCK(cid_lock);
 
-/**
+/*
  * @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

Original file line number	Diff line number	Diff line change
`@@ -11492,7 +11492,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count)`
`11492`	`11492`
`11493`	`11493`	`#ifdef CONFIG_SCHED_MM_CID`
`11494`	`11494`
`11495`		`-/**`
	`11495`	`+/*`
`11496`	`11496`	`* @cid_lock: Guarantee forward-progress of cid allocation.`
`11497`	`11497`	`*`
`11498`	`11498`	`* 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`	`11501`	`*/`
`11502`	`11502`	`DEFINE_RAW_SPINLOCK(cid_lock);`
`11503`	`11503`
`11504`		`-/**`
	`11504`	`+/*`
`11505`	`11505`	`* @use_cid_lock: Select cid allocation behavior: lock-free vs spinlock.`
`11506`	`11506`	`*`
`11507`	`11507`	`* When @use_cid_lock is 0, the cid allocation is lock-free. When contention is`