Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
93d0955e
Commit
93d0955e
authored
May 12, 2021
by
Ingo Molnar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
locking: Fix comment typos
A few snuck through. Signed-off-by:
Ingo Molnar
<
mingo@kernel.org
>
parent
88b06399
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
include/linux/lockdep_types.h
include/linux/lockdep_types.h
+1
-1
kernel/futex.c
kernel/futex.c
+6
-6
No files found.
include/linux/lockdep_types.h
View file @
93d0955e
...
...
@@ -52,7 +52,7 @@ enum lockdep_lock_type {
* NR_LOCKDEP_CACHING_CLASSES ... Number of classes
* cached in the instance of lockdep_map
*
* Currently main class (subclass == 0) and si
gn
le depth subclass
* Currently main class (subclass == 0) and si
ng
le depth subclass
* are cached in lockdep_map. This optimization is mainly targeting
* on rq->lock. double_rq_lock() acquires this highly competitive with
* single depth.
...
...
kernel/futex.c
View file @
93d0955e
...
...
@@ -1874,7 +1874,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1,
* If the caller intends to requeue more than 1 waiter to pifutex,
* force futex_lock_pi_atomic() to set the FUTEX_WAITERS bit now,
* as we have means to handle the possible fault. If not, don't set
* the bit unecessarily as it will force the subsequent unlock to enter
* the bit un
n
ecessarily as it will force the subsequent unlock to enter
* the kernel.
*/
top_waiter
=
futex_top_waiter
(
hb1
,
key1
);
...
...
@@ -2103,7 +2103,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
continue
;
/*
* FUTEX_WAIT_REQEUE_PI and FUTEX_CMP_REQUEUE_PI should always
* FUTEX_WAIT_REQ
U
EUE_PI and FUTEX_CMP_REQUEUE_PI should always
* be paired with each other and no other futex ops.
*
* We should never be requeueing a futex_q with a pi_state,
...
...
@@ -2318,7 +2318,7 @@ static int unqueue_me(struct futex_q *q)
}
/*
* PI futexes can not be requeued and must remove themsel
f
from the
* PI futexes can not be requeued and must remove themsel
ves
from the
* hash bucket. The hash bucket lock (i.e. lock_ptr) is held.
*/
static
void
unqueue_me_pi
(
struct
futex_q
*
q
)
...
...
@@ -2903,7 +2903,7 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
*/
res
=
fixup_owner
(
uaddr
,
&
q
,
!
ret
);
/*
* If fixup_owner() returned an error, prop
ro
gate that. If it acquired
* If fixup_owner() returned an error, prop
a
gate that. If it acquired
* the lock, clear our -ETIMEDOUT or -EINTR.
*/
if
(
res
)
...
...
@@ -3280,7 +3280,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
*/
res
=
fixup_owner
(
uaddr2
,
&
q
,
!
ret
);
/*
* If fixup_owner() returned an error, prop
ro
gate that. If it
* If fixup_owner() returned an error, prop
a
gate that. If it
* acquired the lock, clear -ETIMEDOUT or -EINTR.
*/
if
(
res
)
...
...
@@ -3678,7 +3678,7 @@ void futex_exec_release(struct task_struct *tsk)
{
/*
* The state handling is done for consistency, but in the case of
* exec() there is no way to prevent futher damage as the PID stays
* exec() there is no way to prevent fu
r
ther damage as the PID stays
* the same. But for the unlikely and arguably buggy case that a
* futex is held on exec(), this provides at least as much state
* consistency protection which is possible.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment