* [PATCH 1/1] Documentation/robust-futex-API: remove alternative language
@ 2015-02-16 14:56 Heinrich Schuchardt
2015-02-16 17:13 ` Jonathan Corbet
2015-02-18 17:38 ` Ingo Molnar
0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2015-02-16 14:56 UTC (permalink / raw)
To: Jonathan Corbet
Cc: Ingo Molnar, linux-doc, linux-kernel, Michael Kerrisk,
Heinrich Schuchardt
The man-pages as well as robust-futexes.txt use the word
"contend" for a situation where two threads try to access
the same futex at the same time.
To avoid confusion robust-futex-API.txt should not use
"contest" as alternative language.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
Documentation/robust-futex-ABI.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/robust-futex-ABI.txt b/Documentation/robust-futex-ABI.txt
index 16eb314..e6a5532 100644
--- a/Documentation/robust-futex-ABI.txt
+++ b/Documentation/robust-futex-ABI.txt
@@ -18,8 +18,8 @@ required for futexes is:
by the exiting thread.
The existing normal futexes already provide a "Fast Userspace Locking"
-mechanism, which handles uncontested locking without needing a system
-call, and handles contested locking by maintaining a list of waiting
+mechanism, which handles uncontended locking without needing a system
+call, and handles contended locking by maintaining a list of waiting
threads in the kernel. Options on the sys_futex(2) system call support
waiting on a particular futex, and waking up the next waiter on a
particular futex.
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Documentation/robust-futex-API: remove alternative language
2015-02-16 14:56 [PATCH 1/1] Documentation/robust-futex-API: remove alternative language Heinrich Schuchardt
@ 2015-02-16 17:13 ` Jonathan Corbet
2015-02-18 17:38 ` Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Corbet @ 2015-02-16 17:13 UTC (permalink / raw)
To: Heinrich Schuchardt; +Cc: Ingo Molnar, linux-doc, linux-kernel, Michael Kerrisk
On Mon, 16 Feb 2015 15:56:17 +0100
Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> The man-pages as well as robust-futexes.txt use the word
> "contend" for a situation where two threads try to access
> the same futex at the same time.
>
> To avoid confusion robust-futex-API.txt should not use
> "contest" as alternative language.
Seems sensible. Applied to the docs tree, thanks.
jon
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Documentation/robust-futex-API: remove alternative language
2015-02-16 14:56 [PATCH 1/1] Documentation/robust-futex-API: remove alternative language Heinrich Schuchardt
2015-02-16 17:13 ` Jonathan Corbet
@ 2015-02-18 17:38 ` Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2015-02-18 17:38 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Jonathan Corbet, Ingo Molnar, linux-doc, linux-kernel, Michael Kerrisk
* Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> The man-pages as well as robust-futexes.txt use the word
> "contend" for a situation where two threads try to access
> the same futex at the same time.
>
> To avoid confusion robust-futex-API.txt should not use
> "contest" as alternative language.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> Documentation/robust-futex-ABI.txt | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/robust-futex-ABI.txt b/Documentation/robust-futex-ABI.txt
> index 16eb314..e6a5532 100644
> --- a/Documentation/robust-futex-ABI.txt
> +++ b/Documentation/robust-futex-ABI.txt
> @@ -18,8 +18,8 @@ required for futexes is:
> by the exiting thread.
>
> The existing normal futexes already provide a "Fast Userspace Locking"
> -mechanism, which handles uncontested locking without needing a system
> -call, and handles contested locking by maintaining a list of waiting
> +mechanism, which handles uncontended locking without needing a system
> +call, and handles contended locking by maintaining a list of waiting
So this was a typo, not alternative language! :-)
Acked-by: Ingo Molnar <mingo@kernel.org>
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-18 17:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-16 14:56 [PATCH 1/1] Documentation/robust-futex-API: remove alternative language Heinrich Schuchardt
2015-02-16 17:13 ` Jonathan Corbet
2015-02-18 17:38 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).